aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/h264addpx_template.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-30 22:51:19 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-30 22:54:33 +0200
commit7e9c7b623f051eea2e9565a260dae071f873cb42 (patch)
treee1d8eba0aa2b89355ee28c9bcc0af207320afaf6 /libavcodec/h264addpx_template.c
parent8e6c5c4322367ab066bbb0134eac5ee9c1aafdc3 (diff)
parent271ce76d317c5432e151216cf23f12b77ed6cb7e (diff)
downloadffmpeg-7e9c7b623f051eea2e9565a260dae071f873cb42.tar.gz
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>
Diffstat (limited to 'libavcodec/h264addpx_template.c')
0 files changed, 0 insertions, 0 deletions