diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 14:24:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 14:24:54 +0200 |
| commit | 0bcf514198bfcb5ae99744bd82842ae37a5a55ad (patch) | |
| tree | 9a346075a4afe61ac97eb083415d86eb03813641 /libavformat/utils.c | |
| parent | 1ee5e2ce3d6d28d0e2999afe073bc00ddb96c171 (diff) | |
| parent | 01f9540320279954b2764645ab7136847d53d89f (diff) | |
| download | ffmpeg-0bcf514198bfcb5ae99744bd82842ae37a5a55ad.tar.gz | |
Merge commit '01f9540320279954b2764645ab7136847d53d89f' into release/1.1
* commit '01f9540320279954b2764645ab7136847d53d89f':
h264_sei: check SEI size
Conflicts:
libavcodec/h264_sei.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
0 files changed, 0 insertions, 0 deletions