diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-08 05:02:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-08 05:02:52 +0200 |
| commit | d28a8ad8f33df0b65aa9daa0ed516c9d78dabdb9 (patch) | |
| tree | 725341047df6bd3e86136bd95901d8e9a21f5359 /libavcodec/mjpeg.h | |
| parent | b5a87dc193d6901a00aa4d195f1aae9519b8712f (diff) | |
| parent | f054e309c58894450a5d18cce9799ef58aab9f14 (diff) | |
| download | ffmpeg-d28a8ad8f33df0b65aa9daa0ed516c9d78dabdb9.tar.gz | |
Merge commit 'f054e309c58894450a5d18cce9799ef58aab9f14'
* commit 'f054e309c58894450a5d18cce9799ef58aab9f14':
qdm2: use init_static_data
westwood_vqa: do not free extradata on error in read_header
Conflicts:
libavformat/westwood_vqa.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpeg.h')
0 files changed, 0 insertions, 0 deletions