diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-24 15:03:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-24 15:03:32 +0200 |
| commit | 9c2e31c3b3a2a8ec9672bcda94512dd4f6ef301b (patch) | |
| tree | 6690116e2856a2061ea6e20f7bb351e6c25fe24a /libavcodec/rangecoder.c | |
| parent | 0ebc3728561cc7a875c33bf1a5590d31eb53d9ac (diff) | |
| parent | 26179964ff3fa1173e6f512c5735ba8223e2395d (diff) | |
| download | ffmpeg-9c2e31c3b3a2a8ec9672bcda94512dd4f6ef301b.tar.gz | |
Merge commit '26179964ff3fa1173e6f512c5735ba8223e2395d'
* commit '26179964ff3fa1173e6f512c5735ba8223e2395d':
h264_sei: log unknown sei messages
Conflicts:
libavcodec/h264_sei.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rangecoder.c')
0 files changed, 0 insertions, 0 deletions