diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 19:30:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 19:30:07 +0200 |
| commit | 330791c2ae2b7a10147add181373c11984c7284b (patch) | |
| tree | f5e895f760594436a308e86abb50a7c8a69785b9 /doc/examples/decoding_encoding.c | |
| parent | 5404bf29c3b720ef04314c50b18047a94e4534b6 (diff) | |
| parent | 184c79729d4011f33027bcdc61a63d521017ebc1 (diff) | |
| download | ffmpeg-330791c2ae2b7a10147add181373c11984c7284b.tar.gz | |
Merge commit '184c79729d4011f33027bcdc61a63d521017ebc1' into release/0.10
* commit '184c79729d4011f33027bcdc61a63d521017ebc1':
h264_sei: check SEI size
Conflicts:
libavcodec/h264_sei.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/decoding_encoding.c')
0 files changed, 0 insertions, 0 deletions