diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-03 08:54:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-03 08:54:54 +0200 |
| commit | 7cd13f618c3cf47c21ec8128ed61f16a14c349ef (patch) | |
| tree | 193055d863976a9edf20441d441ee0ab40adc64e /libavformat/avi.h | |
| parent | bdccfc3fc354632f49721fc435310fb958843b21 (diff) | |
| parent | 0d8b943d204bd16fcf2f4a59c742e65a401dd3d0 (diff) | |
| download | ffmpeg-7cd13f618c3cf47c21ec8128ed61f16a14c349ef.tar.gz | |
Merge commit '0d8b943d204bd16fcf2f4a59c742e65a401dd3d0'
* commit '0d8b943d204bd16fcf2f4a59c742e65a401dd3d0':
h264_sei: Return meaningful values
Conflicts:
libavcodec/h264_sei.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avi.h')
0 files changed, 0 insertions, 0 deletions