[FFmpeg-cvslog] Merge commit '277ff7f5dc134f1c2dfc4ea0ef3540340482e3d2'

Michael Niedermayer git at videolan.org
Mon Nov 24 12:54:38 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | 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 <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=932d8d790ccf4e8ce67b97057e5aaf738bbfc65a
---





More information about the ffmpeg-cvslog mailing list