1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-20 07:48:15 +02:00
FFmpeg/libavcodec
Michael Niedermayer 7e9c7b623f 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@gmx.at>
2015-06-30 22:54:33 +02:00
..
2015-06-14 15:09:33 +02:00
2015-06-24 14:45:16 +01:00
2015-06-19 13:57:36 +02:00
2015-06-28 14:51:07 +02:00
2015-06-24 15:09:31 -07:00
2015-06-17 20:11:43 +02:00
2015-06-26 22:18:24 +02:00
2015-06-26 23:35:26 +02:00