ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Mon Nov 24
12:45:07 2014 +0100| [932d8d790ccf4e8ce67b97057e5aaf738bbfc65a] | committer:
Michael Niedermayer
Merge commit '277ff7f5dc134f1c2dfc4ea0ef3540340482e3d2'
* commit '277ff7f5dc134f1c2dfc4ea0ef3540340482e3d2':
lavu: move internal define to the only places where it is used
Conflicts:
libavcodec/h264_cabac.c
libavutil/internal.h
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=932d8d790ccf4e8ce67b97057e5aaf738bbfc65a
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
