diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 12:17:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 12:17:51 +0100 |
| commit | ad48c9374e13ecdf1399c44e9ea443a77232168a (patch) | |
| tree | 3432550c5a40fc663d8914c8806918b910633783 /libavformat/microdvdenc.c | |
| parent | c4c2b2ea5c0a1879f512c2023956d7322edc98d3 (diff) | |
| parent | 8e0cf39faf02536dca08f4fe628a66d1ae022fde (diff) | |
| download | ffmpeg-ad48c9374e13ecdf1399c44e9ea443a77232168a.tar.gz | |
Merge commit '8e0cf39faf02536dca08f4fe628a66d1ae022fde'
* commit '8e0cf39faf02536dca08f4fe628a66d1ae022fde':
build: Let all MJPEG-related decoders depend on the MJPEG decoder
Conflicts:
configure
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/microdvdenc.c')
0 files changed, 0 insertions, 0 deletions