[SCM] ffmpeg/master: Update encdec*_list.txt

[aca-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ca2850a5d4712b6c245c2a2fe0a669d9ea17dfe1
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Tue Oct 11 21:00:34 2016 +0200

    Update encdec*_list.txt

diff --git a/debian/tests/encdec-extra_list.txt b/debian/tests/encdec-extra_list.txt
index 67897e3..bfb3e65 100644
--- a/debian/tests/encdec-extra_list.txt
+++ b/debian/tests/encdec-extra_list.txt
@@ -1,19 +1,13 @@
-3g2; a=aac:libvo_aacenc a=amr_nb:libopencore_amrnb a=amr_wb:libvo_amrwbenc
-3gp; a=aac:libvo_aacenc a=amr_nb:libopencore_amrnb a=amr_wb:libvo_amrwbenc
+3g2; a=amr_nb:libopencore_amrnb a=amr_wb:libvo_amrwbenc
+3gp; a=amr_nb:libopencore_amrnb a=amr_wb:libvo_amrwbenc
 amr; a=amr_nb:libopencore_amrnb a=amr_wb:libvo_amrwbenc
-asf; a=aac:libvo_aacenc a=amr_nb:libopencore_amrnb a=amr_wb:libvo_amrwbenc
-avi; a=aac:libvo_aacenc a=amr_nb:libopencore_amrnb a=amr_wb:libvo_amrwbenc
+asf; a=amr_nb:libopencore_amrnb a=amr_wb:libvo_amrwbenc
+avi; a=amr_nb:libopencore_amrnb a=amr_wb:libvo_amrwbenc
 caf; a=amr_nb:libopencore_amrnb
-ffm; a=aac:libvo_aacenc a=amr_nb:libopencore_amrnb a=amr_wb:libvo_amrwbenc
-flv; a=aac:libvo_aacenc
-hls; a=aac:libvo_aacenc
-matroska; a=aac:libvo_aacenc a=amr_nb:libopencore_amrnb a=amr_wb:libvo_amrwbenc
-mov; a=aac:libvo_aacenc a=amr_nb:libopencore_amrnb a=amr_wb:libvo_amrwbenc
-mp4; a=aac:libvo_aacenc
-mpegts; a=aac:libvo_aacenc
-nut; a=aac:libvo_aacenc a=amr_nb:libopencore_amrnb a=amr_wb:libvo_amrwbenc
-rm; a=aac:libvo_aacenc
-spdif; a=aac:libvo_aacenc
-w64; a=aac:libvo_aacenc a=amr_nb:libopencore_amrnb a=amr_wb:libvo_amrwbenc
-wav; a=aac:libvo_aacenc a=amr_nb:libopencore_amrnb a=amr_wb:libvo_amrwbenc
-wtv; a=aac:libvo_aacenc a=amr_nb:libopencore_amrnb a=amr_wb:libvo_amrwbenc
\ No newline at end of file
+ffm; a=amr_nb:libopencore_amrnb a=amr_wb:libvo_amrwbenc
+matroska; a=amr_nb:libopencore_amrnb a=amr_wb:libvo_amrwbenc
+mov; a=amr_nb:libopencore_amrnb a=amr_wb:libvo_amrwbenc
+nut; a=amr_nb:libopencore_amrnb a=amr_wb:libvo_amrwbenc
+w64; a=amr_nb:libopencore_amrnb a=amr_wb:libvo_amrwbenc
+wav; a=amr_nb:libopencore_amrnb a=amr_wb:libvo_amrwbenc
+wtv; a=amr_nb:libopencore_amrnb a=amr_wb:libvo_amrwbenc
diff --git a/debian/tests/encdec_list.txt b/debian/tests/encdec_list.txt
index 9ce54b0..27fa391 100644
--- a/debian/tests/encdec_list.txt
+++ b/debian/tests/encdec_list.txt
@@ -4,52 +4,54 @@ ac3; a=ac3:ac3
 adx; a=adpcm_adx
 aiff; a=adpcm_ima_qt a=pcm_alaw a=pcm_f32be a=pcm_f64be a=pcm_mulaw a=pcm_s16be a=pcm_s16le a=pcm_s24be a=pcm_s32be a=pcm_s8 a=pcm_u8
 apng; v=apng
-asf; v=amv v=asv1 v=asv2 v=ayuv v=cinepak v=cljr v=dirac:libschroedinger v=dpx v=dvvideo v=ffv1 v=ffvhuff v=flashsv v=flv1:flv v=h261 v=h263 v=h264:libx264 v=h264:libx264rgb v=huffyuv v=jpeg2000:jpeg2000 v=jpeg2000:libopenjpeg v=jpegls v=mjpeg v=mpeg1video v=mpeg2video v=mpeg4:mpeg4 v=msmpeg4v2 v=msmpeg4v3:msmpeg4 v=msvideo1 v=png v=r10k v=r210 v=snow v=svq1 v=targa v=theora:libtheora v=utvideo v=v210 v=v308 v=v408 v=v410 v=vp8:libvpx v=vp9:libvpx-vp9 v=wmv1 v=wmv2 v=y41p v=yuv4 v=zlib v=zmbv a=aac a=ac3:ac3 a=ac3:ac3_fixed a=adpcm_g722:g722 a=adpcm_g726:g726 a=adpcm_ima_wav a=adpcm_ms a=adpcm_swf a=adpcm_yamaha a=dts:dca a=eac3 a=flac a=g723_1 a=gsm_ms:libgsm_ms a=mp2:mp2 a=mp2:mp2fixed a=mp2:libtwolame a=mp3:libmp3lame a=mp3:libshine a=pcm_alaw a=pcm_f32le a=pcm_f64le a=pcm_mulaw a=pcm_s16le a=pcm_s24le a=pcm_s32le a=pcm_u8 a=sonic a=speex:libspeex a=vorbis:vorbis a=vorbis:libvorbis a=wmav1 a=wmav2
+asf; v=amv v=asv1 v=asv2 v=ayuv v=cinepak v=cljr v=dirac:vc2 v=dirac:libschroedinger v=dpx v=dvvideo v=ffv1 v=ffvhuff v=flashsv v=flv1:flv v=h261 v=h263 v=h264:libx264 v=h264:libx264rgb v=huffyuv v=jpeg2000:jpeg2000 v=jpeg2000:libopenjpeg v=jpegls v=mjpeg:mjpeg v=mpeg1video v=mpeg2video v=mpeg4:mpeg4 v=mpeg4:libxvid v=msmpeg4v2 v=msmpeg4v3:msmpeg4 v=msvideo1 v=png v=r10k v=r210 v=snow v=svq1 v=targa v=theora:libtheora v=utvideo v=v210 v=v308 v=v408 v=v410 v=vp8:libvpx v=vp9:libvpx-vp9 v=wmv1 v=wmv2 v=y41p v=yuv4 v=zlib v=zmbv a=aac a=ac3:ac3 a=ac3:ac3_fixed a=adpcm_g722:g722 a=adpcm_g726:g726 a=adpcm_ima_wav a=adpcm_ms a=adpcm_swf a=adpcm_yamaha a=dts:dca a=eac3 a=flac a=g723_1 a=gsm_ms:libgsm_ms a=mp2:mp2 a=mp2:mp2fixed a=mp2:libtwolame a=mp3:libmp3lame a=mp3:libshine a=pcm_alaw a=pcm_f32le a=pcm_f64le a=pcm_mulaw a=pcm_s16le a=pcm_s24le a=pcm_s32le a=pcm_u8 a=sonic a=speex:libspeex a=vorbis:vorbis a=vorbis:libvorbis a=wmav1 a=wmav2
 ast; a=pcm_s16be_planar
 au; a=adpcm_g722:g722 a=pcm_alaw a=pcm_f32be a=pcm_f64be a=pcm_mulaw a=pcm_s16be a=pcm_s24be a=pcm_s32be a=pcm_s8
-avi; v=amv v=asv1 v=asv2 v=ayuv v=cinepak v=cljr v=dirac:libschroedinger v=dpx v=dvvideo v=ffv1 v=ffvhuff v=flashsv v=flv1:flv v=h261 v=h263 v=h264:libx264 v=h264:libx264rgb v=hap v=huffyuv v=jpeg2000:jpeg2000 v=jpeg2000:libopenjpeg v=jpegls v=mjpeg v=mpeg1video v=mpeg2video v=mpeg4:mpeg4 v=mpeg4:libxvid v=msmpeg4v2 v=msmpeg4v3:msmpeg4 v=msvideo1 v=png v=prores:prores v=prores:prores_aw v=prores:prores_ks v=r10k v=r210 v=snow v=svq1 v=targa v=theora:libtheora v=utvideo v=v210 v=v308 v=v408 v=v410 v=vp8:libvpx v=vp9:libvpx-vp9 v=wmv1 v=wmv2 v=y41p v=yuv4 v=zlib v=zmbv a=aac a=ac3:ac3 a=ac3:ac3_fixed a=adpcm_g722:g722 a=adpcm_g726:g726 a=adpcm_ima_wav a=adpcm_ms a=adpcm_swf a=adpcm_yamaha a=dts:dca a=eac3 a=flac a=g723_1 a=gsm_ms:libgsm_ms a=mp2:mp2 a=mp2:mp2fixed a=mp2:libtwolame a=mp3:libmp3lame a=mp3:libshine a=pcm_alaw a=pcm_f32le a=pcm_f64le a=pcm_mulaw a=pcm_s16le a=pcm_s24le a=pcm_s32le a=pcm_u8 a=sonic a=speex:libspeex a=vorbis:vorbis a=vorbis:libvorbis a=wmav1 a=wmav2
+avi; v=amv v=asv1 v=asv2 v=ayuv v=cinepak v=cljr v=dirac:vc2 v=dirac:libschroedinger v=dpx v=dvvideo v=ffv1 v=ffvhuff v=flashsv v=flv1:flv v=h261 v=h263 v=h264:libx264 v=h264:libx264rgb v=hap v=huffyuv v=jpeg2000:jpeg2000 v=jpeg2000:libopenjpeg v=jpegls v=mjpeg:mjpeg v=mpeg1video v=mpeg2video v=mpeg4:mpeg4 v=mpeg4:libxvid v=msmpeg4v2 v=msmpeg4v3:msmpeg4 v=msvideo1 v=png v=prores:prores v=prores:prores_aw v=prores:prores_ks v=r10k v=r210 v=snow v=svq1 v=targa v=theora:libtheora v=utvideo v=v210 v=v308 v=v408 v=v410 v=vp8:libvpx v=vp9:libvpx-vp9 v=wmv1 v=wmv2 v=y41p v=yuv4 v=zlib v=zmbv a=aac a=ac3:ac3 a=ac3:ac3_fixed a=adpcm_g722:g722 a=adpcm_g726:g726 a=adpcm_ima_wav a=adpcm_ms a=adpcm_swf a=adpcm_yamaha a=dts:dca a=eac3 a=flac a=g723_1 a=gsm_ms:libgsm_ms a=mp2:mp2 a=mp2:mp2fixed a=mp2:libtwolame a=mp3:libmp3lame a=mp3:libshine a=pcm_alaw a=pcm_f32le a=pcm_f64le a=pcm_mulaw a=pcm_s16le a=pcm_s24le a=pcm_s32le a=pcm_u8 a=sonic a=speex:libspeex a=vorbis:vorbis a=vorbis:libvorbis a=wmav1 a=wmav2
 caf; a=ac3:ac3 a=ac3:ac3_fixed a=adpcm_ima_qt a=adpcm_ima_wav a=adpcm_ms a=alac a=gsm:libgsm a=gsm_ms:libgsm_ms a=mp2:mp2 a=mp2:mp2fixed a=mp2:libtwolame a=mp3:libmp3lame a=mp3:libshine a=pcm_alaw a=pcm_f32be a=pcm_f32le a=pcm_f64be a=pcm_f64le a=pcm_mulaw a=pcm_s16be a=pcm_s16le a=pcm_s24be a=pcm_s24le a=pcm_s32be a=pcm_s32le a=pcm_s8
-dirac; v=dirac:libschroedinger
+dirac; v=dirac:vc2 v=dirac:libschroedinger
 dnxhd; v=dnxhd
 dts; a=dts:dca
 dv; v=dvvideo
 eac3; a=eac3
-ffm; v=alias_pix v=amv v=asv1 v=asv2 v=avrp v=ayuv v=bmp v=cinepak v=cljr v=dirac:libschroedinger v=dnxhd v=dpx v=dvvideo v=ffv1 v=ffvhuff v=flashsv v=flashsv2 v=flv1:flv v=h261 v=h263 v=h263p v=h264:libx264 v=h264:libx264rgb v=hap v=hevc:libx265 v=huffyuv v=jpeg2000:jpeg2000 v=jpeg2000:libopenjpeg v=jpegls v=mjpeg v=mpeg1video v=mpeg2video v=mpeg4:mpeg4 v=mpeg4:libxvid v=msmpeg4v2 v=msmpeg4v3:msmpeg4 v=msvideo1 v=pam v=pbm v=pcx v=pgm v=pgmyuv v=png v=ppm v=prores:prores v=prores:prores_aw v=prores:prores_ks v=qtrle v=r10k v=r210 v=rawvideo v=roq:roqvideo v=sgi v=snow v=sunrast v=svq1 v=targa v=tiff v=v210 v=v308 v=v408 v=v410 v=vp8:libvpx v=vp9:libvpx-vp9 v=webp:libwebp v=wmv1 v=wmv2 v=xbm v=xface v=xwd v=y41p v=yuv4 v=zmbv a=aac a=ac3:ac3 a=ac3:ac3_fixed a=adpcm_adx a=adpcm_g722:g722 a=adpcm_g726:g726 a=adpcm_ima_qt a=adpcm_ima_wav a=adpcm_ms a=adpcm_swf a=adpcm_yamaha a=comfortnoise a=dts:dca a=eac3 a=flac a=g723_1 a=gsm:libgsm a=gsm_ms:libgsm_ms a=mp2:mp2 a=mp2:mp2fixed a=mp2:libtwolame a=mp3:libmp3lame a=mp3:libshine a=nellymoser a=opus:libopus a=pcm_alaw a=pcm_f32be a=pcm_f32le a=pcm_f64be a=pcm_f64le a=pcm_mulaw a=pcm_s16be a=pcm_s16be_planar a=pcm_s16le a=pcm_s16le_planar a=pcm_s24be a=pcm_s24daud a=pcm_s24le a=pcm_s24le_planar a=pcm_s32be a=pcm_s32le a=pcm_s32le_planar a=pcm_s8 a=pcm_s8_planar a=pcm_u16be a=pcm_u16le a=pcm_u24be a=pcm_u24le a=pcm_u32be a=pcm_u32le a=pcm_u8 a=ra_144:real_144 a=roq_dpcm a=s302m a=speex:libspeex a=wavpack:wavpack a=wavpack:libwavpack a=wmav1 a=wmav2
+ffm; v=alias_pix v=amv v=asv1 v=asv2 v=avrp v=ayuv v=bmp v=cinepak v=cljr v=dirac:vc2 v=dirac:libschroedinger v=dnxhd v=dpx v=dvvideo v=ffv1 v=ffvhuff v=flashsv v=flashsv2 v=flv1:flv v=h261 v=h263 v=h263p v=h264:libx264 v=h264:libx264rgb v=hap v=hevc:libx265 v=huffyuv v=jpeg2000:jpeg2000 v=jpeg2000:libopenjpeg v=jpegls v=mjpeg:mjpeg v=mpeg1video v=mpeg2video v=mpeg4:mpeg4 v=mpeg4:libxvid v=msmpeg4v2 v=msmpeg4v3:msmpeg4 v=msvideo1 v=pam v=pbm v=pcx v=pgm v=pgmyuv v=png v=ppm v=prores:prores v=prores:prores_aw v=prores:prores_ks v=qtrle v=r10k v=r210 v=rawvideo v=roq:roqvideo v=sgi v=snow v=sunrast v=svq1 v=targa v=tiff v=v210 v=v308 v=v408 v=v410 v=vp8:libvpx v=vp9:libvpx-vp9 v=webp:libwebp v=wmv1 v=wmv2 v=xbm v=xface v=xwd v=y41p v=yuv4 v=zmbv a=aac a=ac3:ac3 a=ac3:ac3_fixed a=adpcm_adx a=adpcm_g722:g722 a=adpcm_g726:g726 a=adpcm_ima_qt a=adpcm_ima_wav a=adpcm_ms a=adpcm_swf a=adpcm_yamaha a=comfortnoise a=dts:dca a=eac3 a=flac a=g723_1 a=gsm:libgsm a=gsm_ms:libgsm_ms a=mp2:mp2 a=mp2:mp2fixed a=mp2:libtwolame a=mp3:libmp3lame a=mp3:libshine a=nellymoser a=opus:libopus a=pcm_alaw a=pcm_f32be a=pcm_f32le a=pcm_f64be a=pcm_f64le a=pcm_mulaw a=pcm_s16be a=pcm_s16be_planar a=pcm_s16le a=pcm_s16le_planar a=pcm_s24be a=pcm_s24daud a=pcm_s24le a=pcm_s24le_planar a=pcm_s32be a=pcm_s32le a=pcm_s32le_planar a=pcm_s8 a=pcm_s8_planar a=pcm_u16be a=pcm_u16le a=pcm_u24be a=pcm_u24le a=pcm_u32be a=pcm_u32le a=pcm_u8 a=ra_144:real_144 a=roq_dpcm a=s302m a=speex:libspeex a=wavpack:wavpack a=wavpack:libwavpack a=wmav1 a=wmav2
 flac; a=flac
 flv; v=flashsv v=flashsv2 v=flv1:flv v=h263 v=h264:libx264 v=h264:libx264rgb a=aac a=adpcm_swf a=mp3:libmp3lame a=mp3:libshine a=nellymoser a=pcm_alaw a=pcm_mulaw a=pcm_s16le a=pcm_u8
 g722; a=adpcm_g722:g722
 g723_1; a=g723_1
 gif; v=gif
+gsm; a=gsm:libgsm
 gxf; v=dvvideo
 h261; v=h261
 h263; v=h263
 h264; v=h264:libx264 v=h264:libx264rgb
 hevc; v=hevc:libx265
-hls; v=dirac:libschroedinger v=h264:libx264 v=h264:libx264rgb v=hevc:libx265 v=mpeg1video v=mpeg2video v=mpeg4:mpeg4 a=aac a=dts:dca a=mp2:mp2 a=mp2:mp2fixed a=mp2:libtwolame a=s302m
+hls; v=dirac:vc2 v=dirac:libschroedinger v=h264:libx264 v=h264:libx264rgb v=hevc:libx265 v=mpeg1video v=mpeg2video v=mpeg4:mpeg4 a=aac a=ac3:ac3 a=ac3:ac3_fixed a=dts:dca a=eac3 a=mp2:mp2 a=mp2:mp2fixed a=mp2:libtwolame a=mp3:libmp3lame a=mp3:libshine a=opus:libopus a=s302m
 ircam; a=pcm_alaw a=pcm_f32le a=pcm_f64le a=pcm_mulaw a=pcm_s16le a=pcm_s24le a=pcm_s32le a=pcm_s8
 ivf; v=vp8:libvpx v=vp9:libvpx-vp9
 m4v; v=mpeg4:mpeg4 v=mpeg4:libxvid
-matroska; v=amv v=asv1 v=asv2 v=ayuv v=cljr v=dirac:libschroedinger v=dpx v=dvvideo v=ffv1 v=ffvhuff v=flashsv v=flv1:flv v=h261 v=h263 v=h264:libx264 v=h264:libx264rgb v=hevc:libx265 v=huffyuv v=jpeg2000:jpeg2000 v=jpeg2000:libopenjpeg v=jpegls v=mjpeg v=mpeg1video v=mpeg2video v=mpeg4:mpeg4 v=mpeg4:libxvid v=msmpeg4v2 v=msmpeg4v3:msmpeg4 v=msvideo1 v=png v=prores:prores v=prores:prores_aw v=prores:prores_ks v=r10k v=r210 v=rawvideo v=snow v=targa v=theora:libtheora v=utvideo v=v210 v=v308 v=v408 v=v410 v=vp8:libvpx v=vp9:libvpx-vp9 v=wmv1 v=wmv2 v=y41p v=yuv4 v=zlib v=zmbv a=aac a=ac3:ac3 a=ac3:ac3_fixed a=adpcm_g722:g722 a=adpcm_g726:g726 a=adpcm_ima_wav a=adpcm_ms a=adpcm_swf a=adpcm_yamaha a=alac a=dts:dca a=eac3 a=flac a=g723_1 a=gsm_ms:libgsm_ms a=mp2:mp2 a=mp2:mp2fixed a=mp2:libtwolame a=mp3:libmp3lame a=mp3:libshine a=opus:libopus a=pcm_alaw a=pcm_f32le a=pcm_f64le a=pcm_mulaw a=pcm_s16be a=pcm_s16le a=pcm_s24be a=pcm_s24le a=pcm_s32be a=pcm_s32le a=pcm_u8 a=ra_144:real_144 a=sonic a=speex:libspeex a=tta a=vorbis:vorbis a=vorbis:libvorbis a=wavpack:wavpack a=wavpack:libwavpack a=wmav1 a=wmav2
-mjpeg; v=mjpeg
+matroska; v=amv v=asv1 v=asv2 v=ayuv v=cljr v=dirac:vc2 v=dirac:libschroedinger v=dpx v=dvvideo v=ffv1 v=ffvhuff v=flashsv v=flv1:flv v=h261 v=h263 v=h264:libx264 v=h264:libx264rgb v=hevc:libx265 v=huffyuv v=jpeg2000:jpeg2000 v=jpeg2000:libopenjpeg v=jpegls v=mjpeg:mjpeg v=mpeg1video v=mpeg2video v=mpeg4:mpeg4 v=mpeg4:libxvid v=msmpeg4v2 v=msmpeg4v3:msmpeg4 v=msvideo1 v=png v=prores:prores v=prores:prores_aw v=prores:prores_ks v=r10k v=r210 v=rawvideo v=snow v=targa v=theora:libtheora v=utvideo v=v210 v=v308 v=v408 v=v410 v=vp8:libvpx v=vp9:libvpx-vp9 v=wmv1 v=wmv2 v=y41p v=yuv4 v=zlib v=zmbv a=aac a=ac3:ac3 a=ac3:ac3_fixed a=adpcm_g722:g722 a=adpcm_g726:g726 a=adpcm_ima_wav a=adpcm_ms a=adpcm_swf a=adpcm_yamaha a=alac a=dts:dca a=eac3 a=flac a=g723_1 a=gsm_ms:libgsm_ms a=mp2:mp2 a=mp2:mp2fixed a=mp2:libtwolame a=mp3:libmp3lame a=mp3:libshine a=opus:libopus a=pcm_alaw a=pcm_f32le a=pcm_f64le a=pcm_mulaw a=pcm_s16be a=pcm_s16le a=pcm_s24be a=pcm_s24le a=pcm_s32be a=pcm_s32le a=pcm_u8 a=ra_144:real_144 a=sonic a=speex:libspeex a=tta a=vorbis:vorbis a=vorbis:libvorbis a=wavpack:wavpack a=wavpack:libwavpack a=wmav1 a=wmav2
+mjpeg; v=mjpeg:mjpeg
 mmf; a=adpcm_yamaha
-mov; v=amv v=asv1 v=asv2 v=avrp v=avui v=ayuv v=cinepak v=cljr v=dirac:libschroedinger v=dnxhd v=dpx v=dvvideo v=ffv1 v=ffvhuff v=flashsv v=flv1:flv v=h261 v=h263 v=h264:libx264 v=h264:libx264rgb v=hap v=hevc:libx265 v=huffyuv v=jpeg2000:jpeg2000 v=jpeg2000:libopenjpeg v=jpegls v=mjpeg v=mpeg1video v=mpeg2video v=mpeg4:mpeg4 v=mpeg4:libxvid v=msmpeg4v2 v=msmpeg4v3:msmpeg4 v=msvideo1 v=png v=prores:prores v=prores:prores_aw v=prores:prores_ks v=qtrle v=r10k v=r210 v=sgi v=snow v=svq1 v=targa v=theora:libtheora v=tiff v=utvideo v=v210 v=v308 v=v408 v=v410 v=vp8:libvpx v=vp9:libvpx-vp9 v=wmv1 v=wmv2 v=y41p v=yuv4 v=zlib v=zmbv a=aac a=ac3:ac3 a=ac3:ac3_fixed a=adpcm_g722:g722 a=adpcm_g726:g726 a=adpcm_ima_qt a=adpcm_ima_wav a=adpcm_ms a=adpcm_swf a=adpcm_yamaha a=alac a=dts:dca a=eac3 a=flac a=g723_1 a=gsm:libgsm a=gsm_ms:libgsm_ms a=mp2:mp2 a=mp2:mp2fixed a=mp2:libtwolame a=mp3:libmp3lame a=mp3:libshine a=nellymoser a=pcm_alaw a=pcm_f32be a=pcm_f32le a=pcm_f64be a=pcm_f64le a=pcm_mulaw a=pcm_s16be a=pcm_s16le a=pcm_s24be a=pcm_s24le a=pcm_s32be a=pcm_s32le a=pcm_s8 a=pcm_u8 a=sonic a=speex:libspeex a=vorbis:vorbis a=vorbis:libvorbis
+mov; v=amv v=asv1 v=asv2 v=avrp v=avui v=ayuv v=cinepak v=cljr v=dirac:vc2 v=dirac:libschroedinger v=dnxhd v=dpx v=dvvideo v=ffv1 v=ffvhuff v=flashsv v=flv1:flv v=h261 v=h263 v=h264:libx264 v=h264:libx264rgb v=hap v=hevc:libx265 v=huffyuv v=jpeg2000:jpeg2000 v=jpeg2000:libopenjpeg v=jpegls v=mjpeg:mjpeg v=mpeg1video v=mpeg2video v=mpeg4:mpeg4 v=mpeg4:libxvid v=msmpeg4v2 v=msmpeg4v3:msmpeg4 v=msvideo1 v=png v=prores:prores v=prores:prores_aw v=prores:prores_ks v=qtrle v=r10k v=r210 v=sgi v=snow v=svq1 v=targa v=theora:libtheora v=tiff v=utvideo v=v210 v=v308 v=v408 v=v410 v=vp8:libvpx v=vp9:libvpx-vp9 v=wmv1 v=wmv2 v=y41p v=yuv4 v=zlib v=zmbv a=aac a=ac3:ac3 a=ac3:ac3_fixed a=adpcm_g722:g722 a=adpcm_g726:g726 a=adpcm_ima_qt a=adpcm_ima_wav a=adpcm_ms a=adpcm_swf a=adpcm_yamaha a=alac a=dts:dca a=eac3 a=flac a=g723_1 a=gsm:libgsm a=gsm_ms:libgsm_ms a=mp2:mp2 a=mp2:mp2fixed a=mp2:libtwolame a=mp3:libmp3lame a=mp3:libshine a=nellymoser a=pcm_alaw a=pcm_f32be a=pcm_f32le a=pcm_f64be a=pcm_f64le a=pcm_mulaw a=pcm_s16be a=pcm_s16le a=pcm_s24be a=pcm_s24le a=pcm_s32be a=pcm_s32le a=pcm_s8 a=pcm_u8 a=sonic a=speex:libspeex a=vorbis:vorbis a=vorbis:libvorbis
 mp3; a=mp3:libmp3lame a=mp3:libshine
-mp4; v=dirac:libschroedinger v=h264:libx264 v=h264:libx264rgb v=hevc:libx265 v=jpeg2000:jpeg2000 v=jpeg2000:libopenjpeg v=mjpeg v=mpeg1video v=mpeg2video v=mpeg4:mpeg4 v=mpeg4:libxvid v=png a=aac a=ac3:ac3 a=ac3:ac3_fixed a=dts:dca a=eac3 a=mp3:libmp3lame a=mp3:libshine a=vorbis:vorbis a=vorbis:libvorbis
+mp4; v=dirac:vc2 v=dirac:libschroedinger v=h264:libx264 v=h264:libx264rgb v=hevc:libx265 v=jpeg2000:jpeg2000 v=jpeg2000:libopenjpeg v=mjpeg:mjpeg v=mpeg1video v=mpeg2video v=mpeg4:mpeg4 v=mpeg4:libxvid v=png v=vp9:libvpx-vp9 a=aac a=ac3:ac3 a=ac3:ac3_fixed a=dts:dca a=eac3 a=mp3:libmp3lame a=mp3:libshine a=vorbis:vorbis a=vorbis:libvorbis
 mpeg; v=h264:libx264 v=h264:libx264rgb v=hevc:libx265 v=mpeg1video v=mpeg2video v=mpeg4:mpeg4 v=mpeg4:libxvid a=ac3:ac3 a=ac3:ac3_fixed a=dts:dca a=mp2:mp2 a=mp2:mp2fixed a=mp2:libtwolame a=mp3:libmp3lame a=mp3:libshine
-mpegts; v=dirac:libschroedinger v=h264:libx264 v=h264:libx264rgb v=hevc:libx265 v=mpeg1video v=mpeg2video v=mpeg4:mpeg4 a=aac a=dts:dca a=mp2:mp2 a=mp2:mp2fixed a=mp2:libtwolame a=s302m
+mpegts; v=dirac:vc2 v=dirac:libschroedinger v=h264:libx264 v=h264:libx264rgb v=hevc:libx265 v=mpeg1video v=mpeg2video v=mpeg4:mpeg4 a=aac a=ac3:ac3 a=ac3:ac3_fixed a=dts:dca a=eac3 a=mp2:mp2 a=mp2:mp2fixed a=mp2:libtwolame a=mp3:libmp3lame a=mp3:libshine a=opus:libopus a=s302m
+mpjpeg; v=mjpeg:mjpeg
 mxf; v=dnxhd v=dvvideo v=jpeg2000:jpeg2000 v=jpeg2000:libopenjpeg v=mpeg2video
-nut; v=amv v=asv1 v=asv2 v=ayuv v=cinepak v=cljr v=dirac:libschroedinger v=dpx v=dvvideo v=ffv1 v=ffvhuff v=flashsv v=flv1:flv v=h261 v=h263 v=h264:libx264 v=h264:libx264rgb v=hap v=huffyuv v=jpeg2000:jpeg2000 v=jpeg2000:libopenjpeg v=jpegls v=mjpeg v=mpeg1video v=mpeg2video v=mpeg4:mpeg4 v=mpeg4:libxvid v=msmpeg4v2 v=msmpeg4v3:msmpeg4 v=msvideo1 v=png v=prores:prores v=prores:prores_aw v=prores:prores_ks v=r10k v=r210 v=rawvideo v=snow v=svq1 v=targa v=theora:libtheora v=utvideo v=v210 v=v308 v=v408 v=v410 v=vp8:libvpx v=vp9:libvpx-vp9 v=wmv1 v=wmv2 v=xface v=y41p v=yuv4 v=zlib v=zmbv a=aac a=ac3:ac3 a=ac3:ac3_fixed a=adpcm_g722:g722 a=adpcm_ms a=adpcm_swf a=adpcm_yamaha a=comfortnoise a=dts:dca a=flac a=g723_1 a=gsm_ms:libgsm_ms a=mp2:mp2 a=mp2:mp2fixed a=mp2:libtwolame a=mp3:libmp3lame a=mp3:libshine a=pcm_alaw a=pcm_f32be a=pcm_f32le a=pcm_f64be a=pcm_f64le a=pcm_mulaw a=pcm_s16be a=pcm_s16be_planar a=pcm_s16le a=pcm_s16le_planar a=pcm_s24be a=pcm_s24le a=pcm_s24le_planar a=pcm_s32be a=pcm_s32le a=pcm_s32le_planar a=pcm_s8 a=pcm_s8_planar a=pcm_u16be a=pcm_u16le a=pcm_u24be a=pcm_u24le a=pcm_u32be a=pcm_u32le a=pcm_u8 a=sonic a=speex:libspeex a=vorbis:vorbis a=vorbis:libvorbis a=wavpack:wavpack a=wavpack:libwavpack
+nut; v=amv v=asv1 v=asv2 v=ayuv v=cinepak v=cljr v=dirac:vc2 v=dirac:libschroedinger v=dpx v=dvvideo v=ffv1 v=ffvhuff v=flashsv v=flv1:flv v=h261 v=h263 v=h264:libx264 v=h264:libx264rgb v=hap v=huffyuv v=jpeg2000:jpeg2000 v=jpeg2000:libopenjpeg v=jpegls v=mjpeg:mjpeg v=mpeg1video v=mpeg2video v=mpeg4:mpeg4 v=mpeg4:libxvid v=msmpeg4v2 v=msmpeg4v3:msmpeg4 v=msvideo1 v=png v=prores:prores v=prores:prores_aw v=prores:prores_ks v=r10k v=r210 v=rawvideo v=snow v=svq1 v=targa v=theora:libtheora v=utvideo v=v210 v=v308 v=v408 v=v410 v=vp8:libvpx v=vp9:libvpx-vp9 v=wmv1 v=wmv2 v=xface v=y41p v=yuv4 v=zlib v=zmbv a=aac a=ac3:ac3 a=ac3:ac3_fixed a=adpcm_g722:g722 a=adpcm_ms a=adpcm_swf a=adpcm_yamaha a=comfortnoise a=dts:dca a=flac a=g723_1 a=gsm_ms:libgsm_ms a=mp2:mp2 a=mp2:mp2fixed a=mp2:libtwolame a=mp3:libmp3lame a=mp3:libshine a=pcm_alaw a=pcm_f32be a=pcm_f32le a=pcm_f64be a=pcm_f64le a=pcm_mulaw a=pcm_s16be a=pcm_s16be_planar a=pcm_s16le a=pcm_s16le_planar a=pcm_s24be a=pcm_s24le a=pcm_s24le_planar a=pcm_s32be a=pcm_s32le a=pcm_s32le_planar a=pcm_s8 a=pcm_s8_planar a=pcm_u16be a=pcm_u16le a=pcm_u24be a=pcm_u24le a=pcm_u32be a=pcm_u32le a=pcm_u8 a=sonic a=speex:libspeex a=vorbis:vorbis a=vorbis:libvorbis a=wavpack:wavpack a=wavpack:libwavpack
 ogg; v=theora:libtheora a=flac a=opus:libopus a=speex:libspeex a=vorbis:vorbis a=vorbis:libvorbis
 rm; v=rv10 v=rv20 a=aac a=ac3:ac3 a=ac3:ac3_fixed a=ra_144:real_144
 roq; v=roq:roqvideo a=roq_dpcm
 rso; a=pcm_u8
-smjpeg; v=mjpeg a=pcm_s16le
+smjpeg; v=mjpeg:mjpeg a=pcm_s16le
 sox; a=pcm_s32be a=pcm_s32le
 spdif; a=ac3:ac3 a=ac3:ac3_fixed a=mp3:libmp3lame a=mp3:libshine
-swf; v=flv1:flv v=mjpeg a=mp3:libmp3lame a=mp3:libshine
+swf; v=flv1:flv v=mjpeg:mjpeg a=mp3:libmp3lame a=mp3:libshine
 voc; a=pcm_alaw a=pcm_mulaw a=pcm_s16le a=pcm_u8
 w64; a=aac a=ac3:ac3 a=ac3:ac3_fixed a=adpcm_g722:g722 a=adpcm_g726:g726 a=adpcm_ima_wav a=adpcm_ms a=adpcm_swf a=adpcm_yamaha a=dts:dca a=eac3 a=flac a=g723_1 a=gsm_ms:libgsm_ms a=mp2:mp2 a=mp2:mp2fixed a=mp2:libtwolame a=mp3:libmp3lame a=mp3:libshine a=pcm_alaw a=pcm_f32le a=pcm_f64le a=pcm_mulaw a=pcm_s16le a=pcm_s24le a=pcm_s32le a=pcm_u8 a=sonic a=speex:libspeex a=vorbis:vorbis a=vorbis:libvorbis a=wmav1 a=wmav2
 wav; a=aac a=ac3:ac3 a=ac3:ac3_fixed a=adpcm_g722:g722 a=adpcm_g726:g726 a=adpcm_ima_wav a=adpcm_ms a=adpcm_swf a=adpcm_yamaha a=dts:dca a=eac3 a=flac a=g723_1 a=gsm_ms:libgsm_ms a=mp2:mp2 a=mp2:mp2fixed a=mp2:libtwolame a=mp3:libmp3lame a=mp3:libshine a=pcm_alaw a=pcm_f32le a=pcm_f64le a=pcm_mulaw a=pcm_s16le a=pcm_s24le a=pcm_s32le a=pcm_u8 a=sonic a=speex:libspeex a=vorbis:vorbis a=vorbis:libvorbis a=wmav1 a=wmav2
 webm; v=vp8:libvpx v=vp9:libvpx-vp9 a=opus:libopus a=vorbis:vorbis a=vorbis:libvorbis
-wtv; v=amv v=asv1 v=asv2 v=ayuv v=cinepak v=cljr v=dirac:libschroedinger v=dpx v=dvvideo v=ffv1 v=ffvhuff v=flashsv v=flv1:flv v=h261 v=h263 v=h264:libx264 v=h264:libx264rgb v=huffyuv v=jpeg2000:jpeg2000 v=jpeg2000:libopenjpeg v=jpegls v=mpeg1video v=mpeg2video v=mpeg4:mpeg4 v=mpeg4:libxvid v=msmpeg4v2 v=msmpeg4v3:msmpeg4 v=msvideo1 v=png v=r10k v=r210 v=snow v=svq1 v=targa v=v210 v=v308 v=v408 v=v410 v=vp8:libvpx v=vp9:libvpx-vp9 v=wmv1 v=wmv2 v=y41p v=yuv4 v=zmbv a=aac a=ac3:ac3 a=ac3:ac3_fixed a=adpcm_g722:g722 a=adpcm_g726:g726 a=adpcm_ima_wav a=adpcm_ms a=adpcm_swf a=adpcm_yamaha a=dts:dca a=eac3 a=flac a=g723_1 a=gsm_ms:libgsm_ms a=mp2:mp2 a=mp2:mp2fixed a=mp2:libtwolame a=mp3:libmp3lame a=mp3:libshine a=pcm_alaw a=pcm_f32le a=pcm_f64le a=pcm_mulaw a=pcm_s16le a=pcm_s24le a=pcm_s32le a=pcm_u8 a=sonic a=speex:libspeex a=vorbis:vorbis a=vorbis:libvorbis a=wmav1 a=wmav2
+wtv; v=amv v=asv1 v=asv2 v=ayuv v=cinepak v=cljr v=dirac:vc2 v=dirac:libschroedinger v=dpx v=dvvideo v=ffv1 v=ffvhuff v=flashsv v=flv1:flv v=h261 v=h263 v=h264:libx264 v=h264:libx264rgb v=huffyuv v=jpeg2000:jpeg2000 v=jpeg2000:libopenjpeg v=jpegls v=mpeg1video v=mpeg2video v=mpeg4:mpeg4 v=mpeg4:libxvid v=msmpeg4v2 v=msmpeg4v3:msmpeg4 v=msvideo1 v=png v=r10k v=r210 v=snow v=svq1 v=targa v=v210 v=v308 v=v408 v=v410 v=vp8:libvpx v=vp9:libvpx-vp9 v=wmv1 v=wmv2 v=y41p v=yuv4 v=zmbv a=aac a=ac3:ac3 a=ac3:ac3_fixed a=adpcm_g722:g722 a=adpcm_g726:g726 a=adpcm_ima_wav a=adpcm_ms a=adpcm_swf a=adpcm_yamaha a=dts:dca a=eac3 a=flac a=g723_1 a=gsm_ms:libgsm_ms a=mp2:mp2 a=mp2:mp2fixed a=mp2:libtwolame a=mp3:libmp3lame a=mp3:libshine a=pcm_alaw a=pcm_f32le a=pcm_f64le a=pcm_mulaw a=pcm_s16le a=pcm_s24le a=pcm_s32le a=pcm_u8 a=sonic a=speex:libspeex a=vorbis:vorbis a=vorbis:libvorbis a=wmav1 a=wmav2
 wv; a=wavpack:wavpack a=wavpack:libwavpack
\ No newline at end of file

-- 
ffmpeg packaging