diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 17:40:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 17:40:14 +0200 |
| commit | bb5657fabfecd4007816d7310a410f628aa5bf91 (patch) | |
| tree | 31ac5e11e0f9f9bc8601c21ff24d0b354111df15 /libavcodec/smvjpegdec.c | |
| parent | 00c3ff26f230048e844130fcae0ab29ee20991c9 (diff) | |
| parent | 6072184e702b4b631ac72f1b66b75e5f21e0ce2d (diff) | |
| download | ffmpeg-bb5657fabfecd4007816d7310a410f628aa5bf91.tar.gz | |
Merge commit '6072184e702b4b631ac72f1b66b75e5f21e0ce2d'
* commit '6072184e702b4b631ac72f1b66b75e5f21e0ce2d':
asfenc: use codec descriptors instead of AVCodecs to write codec info
Conflicts:
tests/ref/lavf/asf
tests/ref/seek/lavf-asf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/smvjpegdec.c')
0 files changed, 0 insertions, 0 deletions