diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-24 01:45:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-24 01:46:30 +0200 |
| commit | 82e4340f1ef0dba67ca9e264a400aec895293dfe (patch) | |
| tree | 1553dcbd7fb5cd4c4cc7e0ab6d9c49f446e7fa75 /libavformat/img2.c | |
| parent | 97511bc7cf443ffd6b8738f8f290422a0e3b23e5 (diff) | |
| parent | 772d150a6e82542c06b0c251e73dd299d98d1027 (diff) | |
| download | ffmpeg-82e4340f1ef0dba67ca9e264a400aec895293dfe.tar.gz | |
Merge commit '772d150a6e82542c06b0c251e73dd299d98d1027'
* commit '772d150a6e82542c06b0c251e73dd299d98d1027':
h264: error out from decode_nal_units() when AV_EF_EXPLODE is set
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/img2.c')
0 files changed, 0 insertions, 0 deletions