diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 00:44:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 00:44:28 +0200 |
| commit | 8985e7c56130b42f6184b064b7141e365f59356b (patch) | |
| tree | a957787aa28a0bb5d1a9012daf2ece37edcfb3f7 /libavformat/allformats.c | |
| parent | 7856afef524da4eb93e1c823f9cdcd6a2badb3fe (diff) | |
| parent | 9b56ac74b170d12027fbc81f581a451a709f1105 (diff) | |
| download | ffmpeg-8985e7c56130b42f6184b064b7141e365f59356b.tar.gz | |
Merge commit '9b56ac74b170d12027fbc81f581a451a709f1105'
* commit '9b56ac74b170d12027fbc81f581a451a709f1105':
mpjpeg: Initial implementation
Conflicts:
Changelog
libavformat/allformats.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/allformats.c')
| -rw-r--r-- | libavformat/allformats.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index e58ddd5410..af6b92704c 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -198,7 +198,7 @@ void av_register_all(void) REGISTER_MUXDEMUX(MPEGTS, mpegts); REGISTER_DEMUXER (MPEGTSRAW, mpegtsraw); REGISTER_DEMUXER (MPEGVIDEO, mpegvideo); - REGISTER_MUXER (MPJPEG, mpjpeg); + REGISTER_MUXDEMUX(MPJPEG, mpjpeg); REGISTER_DEMUXER (MPL2, mpl2); REGISTER_DEMUXER (MPSUB, mpsub); REGISTER_DEMUXER (MSNWC_TCP, msnwc_tcp); |