[FFmpeg-cvslog] Merge commit '271ce76d317c5432e151216cf23f12b77ed6cb7e'

Michael Niedermayer git at videolan.org
Tue Jun 30 23:07:48 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun 30 22:51:19 2015 +0200| [7e9c7b623f051eea2e9565a260dae071f873cb42] | committer: Michael Niedermayer

Merge commit '271ce76d317c5432e151216cf23f12b77ed6cb7e'

* commit '271ce76d317c5432e151216cf23f12b77ed6cb7e':
  h264: Parse registered data SEI message and AFD value

Conflicts:
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_sei.c
	libavcodec/version.h

See: d6e95669496a89d186f923c34bcaf7d86b7cd59c
See: 22291c372fa703242e8429bed61700ba81258f19
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list