Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 11 Aug 2012 12:50:54 +0000 (14:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 11 Aug 2012 13:01:45 +0000 (15:01 +0200)
* qatar/master:
  lavf: simplify is_intra_only() by using codec descriptors.
  lavc: add an intra-only codec property.
  lavc: add codec descriptors.
  lavc: fix mixing CODEC_ID/AV_CODEC_ID in C++ code.
  dict: move struct AVDictionary definition to dict.c
  dict: add av_dict_count()

Conflicts:
doc/APIchanges
libavcodec/old_codec_ids.h
libavformat/utils.c
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
doc/APIchanges
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/old_codec_ids.h
libavformat/asfenc.c
libavformat/utils.c
libavutil/dict.c
libavutil/dict.h
libavutil/internal.h
libavutil/version.h

diff --cc doc/APIchanges
@@@ -15,63 -13,15 +15,70 @@@ libavutil:     2011-04-1
  
  API changes, most recent first:
  
 +2012-07-31 - xxxxxxx - lavc 54.46.100
 +  Add channels field to AVFrame.
 +
 +2012-07-30 - xxxxxxx - lavu 51.66.100
 +  Add av_get_channel_description()
 +  and av_get_standard_channel_layout() functions.
 +
 +2012-07-20 - xxxxxxx - lavc 54.43.100
 +  Add decode_error_flags field to AVFrame.
 +
 +2012-07-20 - xxxxxxx - lavf 54.18.100
 +  Add avformat_match_stream_specifier() function.
 +
 +2012-07-14 - xxxxxxx - lavc 54.38.100 - avcodec.h
 +  Add metadata to AVFrame, and the accessor functions
 +  av_frame_get_metadata() and av_frame_set_metadata().
 +
 +2012-07-10 - xxxxxxx - lavc 54.33.100
 +  Add av_fast_padded_mallocz().
 +
 +2012-07-10 - xxxxxxx - lavfi 3.2.0 - avfilter.h
 +  Add init_opaque() callback to AVFilter struct.
 +
 +2012-06-26 - xxxxxxx - lavu 51.63.100 - imgutils.h
 +  Add functions to libavutil/imgutils.h:
 +  av_image_get_buffer_size()
 +  av_image_fill_arrays()
 +  av_image_copy_to_buffer()
 +
 +2012-06-24 - xxxxxxx - lavu 51.62.100 - version.h
 +  version moved from avutil.h to version.h
 +
 +2012-04-11 - xxxxxxx - lavu 51.58.100 - error.h
 +  Add av_make_error_string() and av_err2str() utilities to
 +  libavutil/error.h.
 +
 +2012-06-05 - xxxxxxx - lavc 54.24.100
 +  Add pkt_duration field to AVFrame.
 +
 +2012-05-24 - xxxxxxx - lavu 51.54.100
 +  Move AVPALETTE_SIZE and AVPALETTE_COUNT macros from
 +  libavcodec/avcodec.h to libavutil/pixfmt.h.
 +
 +2012-05-07 - xxxxxxx - lavf 54.5.100
 +  Add av_guess_sample_aspect_ratio() function.
 +
 +2012-04-20 - xxxxxxx - lavfi 2.70.100
 +  Add avfilter_unref_bufferp() to avfilter.h.
 +
 +2012-04-12 - xxxxxxx - lavfi 2.68.100
 +  Install libavfilter/asrc_abuffer.h public header.
 +
 +2012-03-26 - a67d9cf - lavfi 2.66.100
 +  Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions.
 +
+ 2012-08-08 - xxxxxxx - lavu 51.38 - dict.h
+   Add av_dict_count().
  2012-08-xx - xxxxxxx - lavc 54.25 - avcodec.h
    Rename CodecID to AVCodecID and all CODEC_ID_* to AV_CODEC_ID_*.
+   To provide backwards compatibility, CodecID is now #defined as AVCodecID.
+   Note that this can break user code that includes avcodec.h and uses the
+   'CodecID' identifier. Such code should either #undef CodecID or stop using the
+   CodecID name.
  
  2012-08-03 - xxxxxxx - lavu 51.37.1 - cpu.h
                         lsws 2.1.1   - swscale.h
@@@ -785,8 -705,8 +786,9 @@@ OBJS-$(!CONFIG_SMALL)                  
  SKIPHEADERS                            += %_tablegen.h                  \
                                            %_tables.h                    \
                                            aac_tablegen_decl.h           \
 +                                          codec_names.h                 \
                                            fft-internal.h                \
+                                           old_codec_ids.h               \
                                            tableprint.h                  \
                                            $(ARCH)/vp56_arith.h          \
  
Simple merge
index 0000000,a0c1fd2..3388405
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,1940 +1,1943 @@@
 - * This file is part of Libav.
+ /*
 - * Libav is free software; you can redistribute it and/or
++ * This file is part of FFmpeg.
+  *
 - * Libav is distributed in the hope that it will be useful,
++ * This table was generated from the long and short names of AVCodecs
++ * please see the respective codec sources for authorship
++ *
++ * FFmpeg is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+  * License as published by the Free Software Foundation; either
+  * version 2.1 of the License, or (at your option) any later version.
+  *
 - * License along with Libav; if not, write to the Free Software
++ * FFmpeg is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
++ * License along with FFmpeg; if not, write to the Free Software
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ #include "avcodec.h"
+ #include "libavutil/internal.h"
+ static const AVCodecDescriptor codec_descriptors[] = {
+     /* video codecs */
+     {
+         .id        = AV_CODEC_ID_MPEG1VIDEO,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "mpeg1video",
+         .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video"),
+     },
+     {
+         .id        = AV_CODEC_ID_MPEG2VIDEO,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "mpeg2video",
+         .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video"),
+     },
+     {
+         .id        = AV_CODEC_ID_MPEG2VIDEO_XVMC,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "mpegvideo_xvmc",
+         .long_name = NULL_IF_CONFIG_SMALL("MPEG-1/2 video XvMC (X-Video Motion Compensation)"),
+     },
+     {
+         .id        = AV_CODEC_ID_H261,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "h261",
+         .long_name = NULL_IF_CONFIG_SMALL("H.261"),
+     },
+     {
+         .id        = AV_CODEC_ID_H263,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "h263",
+         .long_name = NULL_IF_CONFIG_SMALL("H.263 / H.263-1996, H.263+ / H.263-1998 / H.263 version 2"),
+     },
+     {
+         .id        = AV_CODEC_ID_RV10,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "rv10",
+         .long_name = NULL_IF_CONFIG_SMALL("RealVideo 1.0"),
+     },
+     {
+         .id        = AV_CODEC_ID_RV20,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "rv20",
+         .long_name = NULL_IF_CONFIG_SMALL("RealVideo 1.0"),
+     },
+     {
+         .id        = AV_CODEC_ID_MJPEG,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "mjpeg",
+         .long_name = NULL_IF_CONFIG_SMALL("Motion JPEG"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_MJPEGB,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "mjpegb",
+         .long_name = NULL_IF_CONFIG_SMALL("Apple MJPEG-B"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_LJPEG,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "ljpeg",
+         .long_name = NULL_IF_CONFIG_SMALL("Lossless JPEG"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_SP5X,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "sp5x",
+         .long_name = NULL_IF_CONFIG_SMALL("Sunplus JPEG (SP5X)"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_JPEGLS,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "jpegls",
+         .long_name = NULL_IF_CONFIG_SMALL("JPEG-LS"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_MPEG4,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "mpeg4",
+         .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2"),
+     },
+     {
+         .id        = AV_CODEC_ID_RAWVIDEO,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "rawvideo",
+         .long_name = NULL_IF_CONFIG_SMALL("raw video"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_MSMPEG4V1,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "msmpeg4v1",
+         .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 1"),
+     },
+     {
+         .id        = AV_CODEC_ID_MSMPEG4V2,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "msmpeg4v2",
+         .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 2"),
+     },
+     {
+         .id        = AV_CODEC_ID_MSMPEG4V3,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "msmpeg4v3",
+         .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 3"),
+     },
+     {
+         .id        = AV_CODEC_ID_WMV1,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "wmv1",
+         .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 7"),
+     },
+     {
+         .id        = AV_CODEC_ID_WMV2,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "wmv2",
+         .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 8"),
+     },
+     {
+         .id        = AV_CODEC_ID_H263P,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "h263p",
+         .long_name = NULL_IF_CONFIG_SMALL("H.263+ / H.263-1998 / H.263 version 2"),
+     },
+     {
+         .id        = AV_CODEC_ID_H263I,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "h263i",
+         .long_name = NULL_IF_CONFIG_SMALL("Intel H.263"),
+     },
+     {
+         .id        = AV_CODEC_ID_FLV1,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "flv1",
+         .long_name = NULL_IF_CONFIG_SMALL("FLV / Sorenson Spark / Sorenson H.263 (Flash Video)"),
+     },
+     {
+         .id        = AV_CODEC_ID_SVQ1,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "svq1",
+         .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 1 / Sorenson Video 1 / SVQ1"),
+     },
+     {
+         .id        = AV_CODEC_ID_SVQ3,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "svq3",
+         .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 3 / Sorenson Video 3 / SVQ3"),
+     },
+     {
+         .id        = AV_CODEC_ID_DVVIDEO,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "dvvideo",
+         .long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_HUFFYUV,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "huffyuv",
+         .long_name = NULL_IF_CONFIG_SMALL("HuffYUV"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_CYUV,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "cyuv",
+         .long_name = NULL_IF_CONFIG_SMALL("Creative YUV (CYUV)"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_H264,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "h264",
+         .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"),
+     },
+     {
+         .id        = AV_CODEC_ID_INDEO3,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "indeo3",
+         .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo 3"),
+     },
+     {
+         .id        = AV_CODEC_ID_VP3,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "vp3",
+         .long_name = NULL_IF_CONFIG_SMALL("On2 VP3"),
+     },
+     {
+         .id        = AV_CODEC_ID_THEORA,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "theora",
+         .long_name = NULL_IF_CONFIG_SMALL("Theora"),
+     },
+     {
+         .id        = AV_CODEC_ID_ASV1,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "asv1",
+         .long_name = NULL_IF_CONFIG_SMALL("ASUS V1"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_ASV2,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "asv2",
+         .long_name = NULL_IF_CONFIG_SMALL("ASUS V2"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_FFV1,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "ffv1",
+         .long_name = NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"),
+     },
+     {
+         .id        = AV_CODEC_ID_4XM,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "4xm",
+         .long_name = NULL_IF_CONFIG_SMALL("4X Movie"),
+     },
+     {
+         .id        = AV_CODEC_ID_VCR1,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "vcr1",
+         .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_CLJR,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "cljr",
+         .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_MDEC,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "mdec",
+         .long_name = NULL_IF_CONFIG_SMALL("Sony PlayStation MDEC (Motion DECoder)"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_ROQ,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "roq",
+         .long_name = NULL_IF_CONFIG_SMALL("id RoQ video"),
+     },
+     {
+         .id        = AV_CODEC_ID_INTERPLAY_VIDEO,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "interplayvideo",
+         .long_name = NULL_IF_CONFIG_SMALL("Interplay MVE video"),
+     },
+     {
+         .id        = AV_CODEC_ID_XAN_WC3,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "xan_wc3",
+         .long_name = NULL_IF_CONFIG_SMALL("Wing Commander III / Xan"),
+     },
+     {
+         .id        = AV_CODEC_ID_XAN_WC4,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "xan_wc4",
+         .long_name = NULL_IF_CONFIG_SMALL("Wing Commander IV / Xxan"),
+     },
+     {
+         .id        = AV_CODEC_ID_RPZA,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "rpza",
+         .long_name = NULL_IF_CONFIG_SMALL("QuickTime video (RPZA)"),
+     },
+     {
+         .id        = AV_CODEC_ID_CINEPAK,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "cinepak",
+         .long_name = NULL_IF_CONFIG_SMALL("Cinepak"),
+     },
+     {
+         .id        = AV_CODEC_ID_WS_VQA,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "ws_vqa",
+         .long_name = NULL_IF_CONFIG_SMALL("Westwood Studios VQA (Vector Quantized Animation) video"),
+     },
+     {
+         .id        = AV_CODEC_ID_MSRLE,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "msrle",
+         .long_name = NULL_IF_CONFIG_SMALL("Microsoft RLE"),
+     },
+     {
+         .id        = AV_CODEC_ID_MSVIDEO1,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "msvideo1",
+         .long_name = NULL_IF_CONFIG_SMALL("Microsoft Video 1"),
+     },
+     {
+         .id        = AV_CODEC_ID_IDCIN,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "idcin",
+         .long_name = NULL_IF_CONFIG_SMALL("id Quake II CIN video"),
+     },
+     {
+         .id        = AV_CODEC_ID_8BPS,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "8bps",
+         .long_name = NULL_IF_CONFIG_SMALL("QuickTime 8BPS video"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_SMC,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "smc",
+         .long_name = NULL_IF_CONFIG_SMALL("QuickTime Graphics (SMC)"),
+     },
+     {
+         .id        = AV_CODEC_ID_FLIC,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "flic",
+         .long_name = NULL_IF_CONFIG_SMALL("Autodesk Animator Flic video"),
+     },
+     {
+         .id        = AV_CODEC_ID_TRUEMOTION1,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "truemotion1",
+         .long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 1.0"),
+     },
+     {
+         .id        = AV_CODEC_ID_VMDVIDEO,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "vmdvideo",
+         .long_name = NULL_IF_CONFIG_SMALL("Sierra VMD video"),
+     },
+     {
+         .id        = AV_CODEC_ID_MSZH,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "mszh",
+         .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) MSZH"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_ZLIB,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "zlib",
+         .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) ZLIB"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_QTRLE,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "qtrle",
+         .long_name = NULL_IF_CONFIG_SMALL("QuickTime Animation (RLE) video"),
+     },
+     {
+         .id        = AV_CODEC_ID_SNOW,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "snow",
+         .long_name = NULL_IF_CONFIG_SMALL("Snow"),
+     },
+     {
+         .id        = AV_CODEC_ID_TSCC,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "tscc",
+         .long_name = NULL_IF_CONFIG_SMALL("TechSmith Screen Capture Codec"),
+     },
+     {
+         .id        = AV_CODEC_ID_ULTI,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "ulti",
+         .long_name = NULL_IF_CONFIG_SMALL("IBM UltiMotion"),
+     },
+     {
+         .id        = AV_CODEC_ID_QDRAW,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "qdraw",
+         .long_name = NULL_IF_CONFIG_SMALL("Apple QuickDraw"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_VIXL,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "vixl",
+         .long_name = NULL_IF_CONFIG_SMALL("Miro VideoXL"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_QPEG,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "qpeg",
+         .long_name = NULL_IF_CONFIG_SMALL("Q-team QPEG"),
+     },
+     {
+         .id        = AV_CODEC_ID_PNG,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "png",
+         .long_name = NULL_IF_CONFIG_SMALL("PNG (Portable Network Graphics) image"),
+     },
+     {
+         .id        = AV_CODEC_ID_PPM,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "ppm",
+         .long_name = NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_PBM,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "pbm",
+         .long_name = NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_PGM,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "pgm",
+         .long_name = NULL_IF_CONFIG_SMALL("PGM (Portable GrayMap) image"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_PGMYUV,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "pgmyuv",
+         .long_name = NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_PAM,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "pam",
+         .long_name = NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_FFVHUFF,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "ffvhuff",
+         .long_name = NULL_IF_CONFIG_SMALL("Huffyuv FFmpeg variant"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_RV30,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "rv30",
+         .long_name = NULL_IF_CONFIG_SMALL("RealVideo 3.0"),
+     },
+     {
+         .id        = AV_CODEC_ID_RV40,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "rv40",
+         .long_name = NULL_IF_CONFIG_SMALL("RealVideo 4.0"),
+     },
+     {
+         .id        = AV_CODEC_ID_VC1,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "vc1",
+         .long_name = NULL_IF_CONFIG_SMALL("SMPTE VC-1"),
+     },
+     {
+         .id        = AV_CODEC_ID_WMV3,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "wmv3",
+         .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9"),
+     },
+     {
+         .id        = AV_CODEC_ID_LOCO,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "loco",
+         .long_name = NULL_IF_CONFIG_SMALL("LOCO"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_WNV1,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "wnv1",
+         .long_name = NULL_IF_CONFIG_SMALL("Winnov WNV1"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_AASC,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "aasc",
+         .long_name = NULL_IF_CONFIG_SMALL("Autodesk RLE"),
+     },
+     {
+         .id        = AV_CODEC_ID_INDEO2,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "indeo2",
+         .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo 2"),
+     },
+     {
+         .id        = AV_CODEC_ID_FRAPS,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "fraps",
+         .long_name = NULL_IF_CONFIG_SMALL("Fraps"),
+     },
+     {
+         .id        = AV_CODEC_ID_TRUEMOTION2,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "truemotion2",
+         .long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 2.0"),
+     },
+     {
+         .id        = AV_CODEC_ID_BMP,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "bmp",
+         .long_name = NULL_IF_CONFIG_SMALL("BMP (Windows and OS/2 bitmap)"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_CSCD,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "cscd",
+         .long_name = NULL_IF_CONFIG_SMALL("CamStudio"),
+     },
+     {
+         .id        = AV_CODEC_ID_MMVIDEO,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "mmvideo",
+         .long_name = NULL_IF_CONFIG_SMALL("American Laser Games MM Video"),
+     },
+     {
+         .id        = AV_CODEC_ID_ZMBV,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "zmbv",
+         .long_name = NULL_IF_CONFIG_SMALL("Zip Motion Blocks Video"),
+     },
+     {
+         .id        = AV_CODEC_ID_AVS,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "avs",
+         .long_name = NULL_IF_CONFIG_SMALL("AVS (Audio Video Standard) video"),
+     },
+     {
+         .id        = AV_CODEC_ID_SMACKVIDEO,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "smackvideo",
+         .long_name = NULL_IF_CONFIG_SMALL("Smacker video"),
+     },
+     {
+         .id        = AV_CODEC_ID_NUV,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "nuv",
+         .long_name = NULL_IF_CONFIG_SMALL("NuppelVideo/RTJPEG"),
+     },
+     {
+         .id        = AV_CODEC_ID_KMVC,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "kmvc",
+         .long_name = NULL_IF_CONFIG_SMALL("Karl Morton's video codec"),
+     },
+     {
+         .id        = AV_CODEC_ID_FLASHSV,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "flashsv",
+         .long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video v1"),
+     },
+     {
+         .id        = AV_CODEC_ID_CAVS,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "cavs",
+         .long_name = NULL_IF_CONFIG_SMALL("Chinese AVS (Audio Video Standard) (AVS1-P2, JiZhun profile)"),
+     },
+     {
+         .id        = AV_CODEC_ID_JPEG2000,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "jpeg2000",
+         .long_name = NULL_IF_CONFIG_SMALL("JPEG 2000"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_VMNC,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "vmnc",
+         .long_name = NULL_IF_CONFIG_SMALL("VMware Screen Codec / VMware Video"),
+     },
+     {
+         .id        = AV_CODEC_ID_VP5,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "vp5",
+         .long_name = NULL_IF_CONFIG_SMALL("On2 VP5"),
+     },
+     {
+         .id        = AV_CODEC_ID_VP6,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "vp6",
+         .long_name = NULL_IF_CONFIG_SMALL("On2 VP6"),
+     },
+     {
+         .id        = AV_CODEC_ID_VP6F,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "vp6f",
+         .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version)"),
+     },
+     {
+         .id        = AV_CODEC_ID_TARGA,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "targa",
+         .long_name = NULL_IF_CONFIG_SMALL("Truevision Targa image"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_DSICINVIDEO,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "dsicinvideo",
+         .long_name = NULL_IF_CONFIG_SMALL("Delphine Software International CIN video"),
+     },
+     {
+         .id        = AV_CODEC_ID_TIERTEXSEQVIDEO,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "tiertexseqvideo",
+         .long_name = NULL_IF_CONFIG_SMALL("Tiertex Limited SEQ video"),
+     },
+     {
+         .id        = AV_CODEC_ID_TIFF,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "tiff",
+         .long_name = NULL_IF_CONFIG_SMALL("TIFF image"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_GIF,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "gif",
+         .long_name = NULL_IF_CONFIG_SMALL("GIF (Graphics Interchange Format)"),
+     },
+     {
+         .id        = AV_CODEC_ID_DXA,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "dxa",
+         .long_name = NULL_IF_CONFIG_SMALL("Feeble Files/ScummVM DXA"),
+     },
+     {
+         .id        = AV_CODEC_ID_DNXHD,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "dnxhd",
+         .long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_THP,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "thp",
+         .long_name = NULL_IF_CONFIG_SMALL("Nintendo Gamecube THP video"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_SGI,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "sgi",
+         .long_name = NULL_IF_CONFIG_SMALL("SGI image"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_C93,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "c93",
+         .long_name = NULL_IF_CONFIG_SMALL("Interplay C93"),
+     },
+     {
+         .id        = AV_CODEC_ID_BETHSOFTVID,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "bethsoftvid",
+         .long_name = NULL_IF_CONFIG_SMALL("Bethesda VID video"),
+     },
+     {
+         .id        = AV_CODEC_ID_PTX,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "ptx",
+         .long_name = NULL_IF_CONFIG_SMALL("V.Flash PTX image"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_TXD,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "txd",
+         .long_name = NULL_IF_CONFIG_SMALL("Renderware TXD (TeXture Dictionary) image"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_VP6A,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "vp6a",
+         .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version, with alpha channel)"),
+     },
+     {
+         .id        = AV_CODEC_ID_AMV,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "amv",
+         .long_name = NULL_IF_CONFIG_SMALL("AMV Video"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_VB,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "vb",
+         .long_name = NULL_IF_CONFIG_SMALL("Beam Software VB"),
+     },
+     {
+         .id        = AV_CODEC_ID_PCX,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "pcx",
+         .long_name = NULL_IF_CONFIG_SMALL("PC Paintbrush PCX image"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_SUNRAST,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "sunrast",
+         .long_name = NULL_IF_CONFIG_SMALL("Sun Rasterfile image"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_INDEO4,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "indeo4",
+         .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo Video Interactive 4"),
+     },
+     {
+         .id        = AV_CODEC_ID_INDEO5,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "indeo5",
+         .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo Video Interactive 5"),
+     },
+     {
+         .id        = AV_CODEC_ID_MIMIC,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "mimic",
+         .long_name = NULL_IF_CONFIG_SMALL("Mimic"),
+     },
+     {
+         .id        = AV_CODEC_ID_RL2,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "rl2",
+         .long_name = NULL_IF_CONFIG_SMALL("RL2 video"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_ESCAPE124,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "escape124",
+         .long_name = NULL_IF_CONFIG_SMALL("Escape 124"),
+     },
+     {
+         .id        = AV_CODEC_ID_DIRAC,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "dirac",
+         .long_name = NULL_IF_CONFIG_SMALL("Dirac"),
+     },
+     {
+         .id        = AV_CODEC_ID_BFI,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "bfi",
+         .long_name = NULL_IF_CONFIG_SMALL("Brute Force & Ignorance"),
+     },
+     {
+         .id        = AV_CODEC_ID_CMV,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "cmv",
+         .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts CMV video"),
+     },
+     {
+         .id        = AV_CODEC_ID_MOTIONPIXELS,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "motionpixels",
+         .long_name = NULL_IF_CONFIG_SMALL("Motion Pixels video"),
+     },
+     {
+         .id        = AV_CODEC_ID_TGV,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "tgv",
+         .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TGV video"),
+     },
+     {
+         .id        = AV_CODEC_ID_TGQ,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "tgq",
+         .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TGQ video"),
+     },
+     {
+         .id        = AV_CODEC_ID_TQI,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "tqi",
+         .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TQI video"),
+     },
+     {
+         .id        = AV_CODEC_ID_AURA,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "aura",
+         .long_name = NULL_IF_CONFIG_SMALL("Auravision AURA"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_AURA2,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "aura2",
+         .long_name = NULL_IF_CONFIG_SMALL("Auravision Aura 2"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_V210X,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "v210x",
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_TMV,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "tmv",
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_V210,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "v210",
+         .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_DPX,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "dpx",
+         .long_name = NULL_IF_CONFIG_SMALL("DPX image"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_MAD,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "mad",
+         .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts Madcow Video")
+     },
+     {
+         .id        = AV_CODEC_ID_FRWU,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "frwu",
+         .long_name = NULL_IF_CONFIG_SMALL("Forward Uncompressed"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_FLASHSV2,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "flashsv2",
+         .long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video v2"),
+     },
+     {
+         .id        = AV_CODEC_ID_CDGRAPHICS,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "cdgraphics",
+         .long_name = NULL_IF_CONFIG_SMALL("CD Graphics video"),
+     },
+     {
+         .id        = AV_CODEC_ID_R210,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "r210",
+         .long_name = NULL_IF_CONFIG_SMALL("Uncompressed RGB 10-bit"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_ANM,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "anm",
+         .long_name = NULL_IF_CONFIG_SMALL("Deluxe Paint Animation"),
+     },
+     {
+         .id        = AV_CODEC_ID_BINKVIDEO,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "binkvideo",
+         .long_name = NULL_IF_CONFIG_SMALL("Bink video"),
+     },
+     {
+         .id        = AV_CODEC_ID_IFF_ILBM,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "iff_ilbm",
+         .long_name = NULL_IF_CONFIG_SMALL("IFF ILBM"),
+     },
+     {
+         .id        = AV_CODEC_ID_IFF_BYTERUN1,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "iff_byterun1",
+         .long_name = NULL_IF_CONFIG_SMALL("IFF ByteRun1"),
+     },
+     {
+         .id        = AV_CODEC_ID_KGV1,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "kgv1",
+         .long_name = NULL_IF_CONFIG_SMALL("Kega Game Video"),
+     },
+     {
+         .id        = AV_CODEC_ID_YOP,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "yop",
+         .long_name = NULL_IF_CONFIG_SMALL("Psygnosis YOP Video"),
+     },
+     {
+         .id        = AV_CODEC_ID_VP8,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "vp8",
+         .long_name = NULL_IF_CONFIG_SMALL("On2 VP8"),
+     },
+     {
+         .id        = AV_CODEC_ID_PICTOR,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "pictor",
+         .long_name = NULL_IF_CONFIG_SMALL("Pictor/PC Paint"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_ANSI,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "ansi",
+         .long_name = NULL_IF_CONFIG_SMALL("ASCII/ANSI art"),
+     },
+     {
+         .id        = AV_CODEC_ID_A64_MULTI,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "a64_multi",
+         .long_name = NULL_IF_CONFIG_SMALL("Multicolor charset for Commodore 64"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_A64_MULTI5,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "a64_multi5",
+         .long_name = NULL_IF_CONFIG_SMALL("Multicolor charset for Commodore 64, extended with 5th color (colram)"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_R10K,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "r10k",
+         .long_name = NULL_IF_CONFIG_SMALL("AJA Kona 10-bit RGB Codec"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_MXPEG,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "mxpeg",
+         .long_name = NULL_IF_CONFIG_SMALL("Mobotix MxPEG video"),
+     },
+     {
+         .id        = AV_CODEC_ID_LAGARITH,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "lagarith",
+         .long_name = NULL_IF_CONFIG_SMALL("Lagarith lossless"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_PRORES,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "prores",
+         .long_name = NULL_IF_CONFIG_SMALL("Apple ProRes (iCodec Pro)"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_JV,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "jv",
+         .long_name = NULL_IF_CONFIG_SMALL("Bitmap Brothers JV video"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_DFA,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "dfa",
+         .long_name = NULL_IF_CONFIG_SMALL("Chronomaster DFA"),
+     },
+     {
+         .id        = AV_CODEC_ID_WMV3IMAGE,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "wmv3image",
+         .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9 Image"),
+     },
+     {
+         .id        = AV_CODEC_ID_VC1IMAGE,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "vc1image",
+         .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9 Image v2"),
+     },
+     {
+         .id        = AV_CODEC_ID_UTVIDEO,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "utvideo",
+         .long_name = NULL_IF_CONFIG_SMALL("Ut Video"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_BMV_VIDEO,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "bmv_video",
+         .long_name = NULL_IF_CONFIG_SMALL("Discworld II BMV video"),
+     },
+     {
+         .id        = AV_CODEC_ID_VBLE,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "vble",
+         .long_name = NULL_IF_CONFIG_SMALL("VBLE Lossless Codec"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_DXTORY,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "dxtory",
+         .long_name = NULL_IF_CONFIG_SMALL("Dxtory"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_V410,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "v410",
+         .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:4:4 10-bit"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_XWD,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "xwd",
+         .long_name = NULL_IF_CONFIG_SMALL("XWD (X Window Dump) image"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_CDXL,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "cdxl",
+         .long_name = NULL_IF_CONFIG_SMALL("Commodore CDXL video"),
+     },
+     {
+         .id        = AV_CODEC_ID_XBM,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "xbm",
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     {
+         .id        = AV_CODEC_ID_ZEROCODEC,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "zerocodec",
+         .long_name = NULL_IF_CONFIG_SMALL("ZeroCodec Lossless Video"),
+     },
+     {
+         .id        = AV_CODEC_ID_MSS1,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "mss1",
+         .long_name = NULL_IF_CONFIG_SMALL("MS Screen 1"),
+     },
+     {
+         .id        = AV_CODEC_ID_MSA1,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "msa1",
+         .long_name = NULL_IF_CONFIG_SMALL("MS ATC Screen"),
+     },
+     {
+         .id        = AV_CODEC_ID_TSCC2,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "tscc2",
+         .long_name = NULL_IF_CONFIG_SMALL("TechSmith Screen Codec 2"),
+     },
+     {
+         .id        = AV_CODEC_ID_MTS2,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "mts2",
+         .long_name = NULL_IF_CONFIG_SMALL("MS Expression Encoder Screen"),
+     },
+     {
+         .id        = AV_CODEC_ID_CLLC,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "cllc",
+         .long_name = NULL_IF_CONFIG_SMALL("Canopus Lossless Codec"),
+         .props     = AV_CODEC_PROP_INTRA_ONLY,
+     },
+     /* various PCM "codecs" */
+     {
+         .id        = AV_CODEC_ID_PCM_S16LE,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "pcm_s16le",
+         .long_name = NULL_IF_CONFIG_SMALL("PCM signed 16-bit little-endian"),
+     },
+     {
+         .id        = AV_CODEC_ID_PCM_S16BE,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "pcm_s16be",
+         .long_name = NULL_IF_CONFIG_SMALL("PCM signed 16-bit big-endian"),
+     },
+     {
+         .id        = AV_CODEC_ID_PCM_U16LE,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "pcm_u16le",
+         .long_name = NULL_IF_CONFIG_SMALL("PCM unsigned 16-bit little-endian"),
+     },
+     {
+         .id        = AV_CODEC_ID_PCM_U16BE,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "pcm_u16be",
+         .long_name = NULL_IF_CONFIG_SMALL("PCM unsigned 16-bit big-endian"),
+     },
+     {
+         .id        = AV_CODEC_ID_PCM_S8,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "pcm_s8",
+         .long_name = NULL_IF_CONFIG_SMALL("PCM signed 8-bit"),
+     },
+     {
+         .id        = AV_CODEC_ID_PCM_U8,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "pcm_u8",
+         .long_name = NULL_IF_CONFIG_SMALL("PCM unsigned 8-bit"),
+     },
+     {
+         .id        = AV_CODEC_ID_PCM_MULAW,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "pcm_mulaw",
+         .long_name = NULL_IF_CONFIG_SMALL("PCM mu-law"),
+     },
+     {
+         .id        = AV_CODEC_ID_PCM_ALAW,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "pcm_alaw",
+         .long_name = NULL_IF_CONFIG_SMALL("PCM A-law"),
+     },
+     {
+         .id        = AV_CODEC_ID_PCM_S32LE,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "pcm_s32le",
+         .long_name = NULL_IF_CONFIG_SMALL("PCM signed 32-bit little-endian"),
+     },
+     {
+         .id        = AV_CODEC_ID_PCM_S32BE,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "pcm_s32be",
+         .long_name = NULL_IF_CONFIG_SMALL("PCM signed 32-bit big-endian"),
+     },
+     {
+         .id        = AV_CODEC_ID_PCM_U32LE,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "pcm_u32le",
+         .long_name = NULL_IF_CONFIG_SMALL("PCM unsigned 32-bit little-endian"),
+     },
+     {
+         .id        = AV_CODEC_ID_PCM_U32BE,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "pcm_u32be",
+         .long_name = NULL_IF_CONFIG_SMALL("PCM unsigned 32-bit big-endian"),
+     },
+     {
+         .id        = AV_CODEC_ID_PCM_S24LE,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "pcm_s24le",
+         .long_name = NULL_IF_CONFIG_SMALL("PCM signed 24-bit little-endian"),
+     },
+     {
+         .id        = AV_CODEC_ID_PCM_S24BE,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "pcm_s24be",
+         .long_name = NULL_IF_CONFIG_SMALL("PCM signed 24-bit big-endian"),
+     },
+     {
+         .id        = AV_CODEC_ID_PCM_U24LE,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "pcm_u24le",
+         .long_name = NULL_IF_CONFIG_SMALL("PCM unsigned 24-bit little-endian"),
+     },
+     {
+         .id        = AV_CODEC_ID_PCM_U24BE,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "pcm_u24be",
+         .long_name = NULL_IF_CONFIG_SMALL("PCM unsigned 24-bit big-endian"),
+     },
+     {
+         .id        = AV_CODEC_ID_PCM_S24DAUD,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "pcm_s24daud",
+         .long_name = NULL_IF_CONFIG_SMALL("PCM D-Cinema audio signed 24-bit"),
+     },
+     {
+         .id        = AV_CODEC_ID_PCM_ZORK,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "pcm_zork",
+         .long_name = NULL_IF_CONFIG_SMALL("PCM Zork"),
+     },
+     {
+         .id        = AV_CODEC_ID_PCM_S16LE_PLANAR,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "pcm_s16le_planar",
+         .long_name = NULL_IF_CONFIG_SMALL("PCM 16-bit little-endian planar"),
+     },
+     {
+         .id        = AV_CODEC_ID_PCM_DVD,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "pcm_dvd",
+         .long_name = NULL_IF_CONFIG_SMALL("PCM signed 20|24-bit big-endian"),
+     },
+     {
+         .id        = AV_CODEC_ID_PCM_F32BE,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "pcm_f32be",
+         .long_name = NULL_IF_CONFIG_SMALL("PCM 32-bit floating point big-endian"),
+     },
+     {
+         .id        = AV_CODEC_ID_PCM_F32LE,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "pcm_f32le",
+         .long_name = NULL_IF_CONFIG_SMALL("PCM 32-bit floating point little-endian"),
+     },
+     {
+         .id        = AV_CODEC_ID_PCM_F64BE,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "pcm_f64be",
+         .long_name = NULL_IF_CONFIG_SMALL("PCM 64-bit floating point big-endian"),
+     },
+     {
+         .id        = AV_CODEC_ID_PCM_F64LE,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "pcm_f64le",
+         .long_name = NULL_IF_CONFIG_SMALL("PCM 64-bit floating point little-endian"),
+     },
+     {
+         .id        = AV_CODEC_ID_PCM_BLURAY,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "pcm_bluray",
+         .long_name = NULL_IF_CONFIG_SMALL("PCM signed 16|20|24-bit big-endian for Blu-ray media"),
+     },
+     {
+         .id        = AV_CODEC_ID_PCM_LXF,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "pcm_lxf",
+         .long_name = NULL_IF_CONFIG_SMALL("PCM signed 20-bit little-endian planar"),
+     },
+     {
+         .id        = AV_CODEC_ID_S302M,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "s302m",
+         .long_name = NULL_IF_CONFIG_SMALL("SMPTE 302M"),
+     },
+     {
+         .id        = AV_CODEC_ID_PCM_S8_PLANAR,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "pcm_s8_planar",
+         .long_name = NULL_IF_CONFIG_SMALL("PCM signed 8-bit planar"),
+     },
+     /* various ADPCM codecs */
+     {
+         .id        = AV_CODEC_ID_ADPCM_IMA_QT,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "adpcm_ima_qt",
+         .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA QuickTime"),
+     },
+     {
+         .id        = AV_CODEC_ID_ADPCM_IMA_WAV,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "adpcm_ima_wav",
+         .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA WAV"),
+     },
+     {
+         .id        = AV_CODEC_ID_ADPCM_IMA_DK3,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "adpcm_ima_dk3",
+         .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Duck DK3"),
+     },
+     {
+         .id        = AV_CODEC_ID_ADPCM_IMA_DK4,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "adpcm_ima_dk4",
+         .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Duck DK4"),
+     },
+     {
+         .id        = AV_CODEC_ID_ADPCM_IMA_WS,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "adpcm_ima_ws",
+         .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Westwood"),
+     },
+     {
+         .id        = AV_CODEC_ID_ADPCM_IMA_SMJPEG,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "adpcm_ima_smjpeg",
+         .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Loki SDL MJPEG"),
+     },
+     {
+         .id        = AV_CODEC_ID_ADPCM_MS,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "adpcm_ms",
+         .long_name = NULL_IF_CONFIG_SMALL("ADPCM Microsoft"),
+     },
+     {
+         .id        = AV_CODEC_ID_ADPCM_4XM,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "adpcm_4xm",
+         .long_name = NULL_IF_CONFIG_SMALL("ADPCM 4X Movie"),
+     },
+     {
+         .id        = AV_CODEC_ID_ADPCM_XA,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "adpcm_xa",
+         .long_name = NULL_IF_CONFIG_SMALL("ADPCM CDROM XA"),
+     },
+     {
+         .id        = AV_CODEC_ID_ADPCM_ADX,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "adpcm_adx",
+         .long_name = NULL_IF_CONFIG_SMALL("SEGA CRI ADX ADPCM"),
+     },
+     {
+         .id        = AV_CODEC_ID_ADPCM_EA,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "adpcm_ea",
+         .long_name = NULL_IF_CONFIG_SMALL("ADPCM Electronic Arts"),
+     },
+     {
+         .id        = AV_CODEC_ID_ADPCM_G726,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "adpcm_g726",
+         .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"),
+     },
+     {
+         .id        = AV_CODEC_ID_ADPCM_CT,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "adpcm_ct",
+         .long_name = NULL_IF_CONFIG_SMALL("ADPCM Creative Technology"),
+     },
+     {
+         .id        = AV_CODEC_ID_ADPCM_SWF,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "adpcm_swf",
+         .long_name = NULL_IF_CONFIG_SMALL("ADPCM Shockwave Flash"),
+     },
+     {
+         .id        = AV_CODEC_ID_ADPCM_YAMAHA,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "adpcm_yamaha",
+         .long_name = NULL_IF_CONFIG_SMALL("ADPCM Yamaha"),
+     },
+     {
+         .id        = AV_CODEC_ID_ADPCM_SBPRO_4,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "adpcm_sbpro_4",
+         .long_name = NULL_IF_CONFIG_SMALL("ADPCM Sound Blaster Pro 4-bit"),
+     },
+     {
+         .id        = AV_CODEC_ID_ADPCM_SBPRO_3,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "adpcm_sbpro_3",
+         .long_name = NULL_IF_CONFIG_SMALL("ADPCM Sound Blaster Pro 2.6-bit"),
+     },
+     {
+         .id        = AV_CODEC_ID_ADPCM_SBPRO_2,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "adpcm_sbpro_2",
+         .long_name = NULL_IF_CONFIG_SMALL("ADPCM Sound Blaster Pro 2-bit"),
+     },
+     {
+         .id        = AV_CODEC_ID_ADPCM_THP,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "adpcm_thp",
+         .long_name = NULL_IF_CONFIG_SMALL("ADPCM Nintendo Gamecube THP"),
+     },
+     {
+         .id        = AV_CODEC_ID_ADPCM_IMA_AMV,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "adpcm_ima_amv",
+         .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA AMV"),
+     },
+     {
+         .id        = AV_CODEC_ID_ADPCM_EA_R1,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "adpcm_ea_r1",
+         .long_name = NULL_IF_CONFIG_SMALL("ADPCM Electronic Arts R1"),
+     },
+     {
+         .id        = AV_CODEC_ID_ADPCM_EA_R3,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "adpcm_ea_r3",
+         .long_name = NULL_IF_CONFIG_SMALL("ADPCM Electronic Arts R3"),
+     },
+     {
+         .id        = AV_CODEC_ID_ADPCM_EA_R2,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "adpcm_ea_r2",
+         .long_name = NULL_IF_CONFIG_SMALL("ADPCM Electronic Arts R2"),
+     },
+     {
+         .id        = AV_CODEC_ID_ADPCM_IMA_EA_SEAD,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "adpcm_ima_ea_sead",
+         .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Electronic Arts SEAD"),
+     },
+     {
+         .id        = AV_CODEC_ID_ADPCM_IMA_EA_EACS,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "adpcm_ima_ea_eacs",
+         .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Electronic Arts EACS"),
+     },
+     {
+         .id        = AV_CODEC_ID_ADPCM_EA_XAS,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "adpcm_ea_xas",
+         .long_name = NULL_IF_CONFIG_SMALL("ADPCM Electronic Arts XAS"),
+     },
+     {
+         .id        = AV_CODEC_ID_ADPCM_EA_MAXIS_XA,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "adpcm_ea_maxis_xa",
+         .long_name = NULL_IF_CONFIG_SMALL("ADPCM Electronic Arts Maxis CDROM XA"),
+     },
+     {
+         .id        = AV_CODEC_ID_ADPCM_IMA_ISS,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "adpcm_ima_iss",
+         .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Funcom ISS"),
+     },
+     {
+         .id        = AV_CODEC_ID_ADPCM_G722,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "adpcm_g722",
+         .long_name = NULL_IF_CONFIG_SMALL("G.722 ADPCM"),
+     },
+     {
+         .id        = AV_CODEC_ID_ADPCM_IMA_APC,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "adpcm_ima_apc",
+         .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA CRYO APC"),
+     },
+     /* AMR */
+     {
+         .id        = AV_CODEC_ID_AMR_NB,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "amr_nb",
+         .long_name = NULL_IF_CONFIG_SMALL("AMR-NB (Adaptive Multi-Rate NarrowBand)"),
+     },
+     {
+         .id        = AV_CODEC_ID_AMR_WB,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "amr_wb",
+         .long_name = NULL_IF_CONFIG_SMALL("AMR-WB (Adaptive Multi-Rate WideBand)"),
+     },
+     /* RealAudio codecs*/
+     {
+         .id        = AV_CODEC_ID_RA_144,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "ra_144",
+         .long_name = NULL_IF_CONFIG_SMALL("RealAudio 1.0 (14.4K)"),
+     },
+     {
+         .id        = AV_CODEC_ID_RA_288,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "ra_288",
+         .long_name = NULL_IF_CONFIG_SMALL("RealAudio 2.0 (28.8K)"),
+     },
+     /* various DPCM codecs */
+     {
+         .id        = AV_CODEC_ID_ROQ_DPCM,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "roq_dpcm",
+         .long_name = NULL_IF_CONFIG_SMALL("DPCM id RoQ"),
+     },
+     {
+         .id        = AV_CODEC_ID_INTERPLAY_DPCM,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "interplay_dpcm",
+         .long_name = NULL_IF_CONFIG_SMALL("DPCM Interplay"),
+     },
+     {
+         .id        = AV_CODEC_ID_XAN_DPCM,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "xan_dpcm",
+         .long_name = NULL_IF_CONFIG_SMALL("DPCM Xan"),
+     },
+     {
+         .id        = AV_CODEC_ID_SOL_DPCM,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "sol_dpcm",
+         .long_name = NULL_IF_CONFIG_SMALL("DPCM Sol"),
+     },
+     /* audio codecs */
+     {
+         .id        = AV_CODEC_ID_MP2,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "mp2",
+         .long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"),
+     },
+     {
+         .id        = AV_CODEC_ID_MP3,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "mp3",
+         .long_name = NULL_IF_CONFIG_SMALL("MP3 (MPEG audio layer 3)"),
+     },
+     {
+         .id        = AV_CODEC_ID_AAC,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "aac",
+         .long_name = NULL_IF_CONFIG_SMALL("AAC (Advanced Audio Coding)"),
+     },
+     {
+         .id        = AV_CODEC_ID_AC3,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "ac3",
+         .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"),
+     },
+     {
+         .id        = AV_CODEC_ID_DTS,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "dts",
+         .long_name  = NULL_IF_CONFIG_SMALL("DCA (DTS Coherent Acoustics)"),
+     },
+     {
+         .id        = AV_CODEC_ID_VORBIS,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "vorbis",
+         .long_name  = NULL_IF_CONFIG_SMALL("Vorbis"),
+     },
+     {
+         .id        = AV_CODEC_ID_DVAUDIO,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "dvaudio",
+     },
+     {
+         .id        = AV_CODEC_ID_WMAV1,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "wmav1",
+         .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 1"),
+     },
+     {
+         .id        = AV_CODEC_ID_WMAV2,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "wmav2",
+         .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 2"),
+     },
+     {
+         .id        = AV_CODEC_ID_MACE3,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "mace3",
+         .long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 3:1"),
+     },
+     {
+         .id        = AV_CODEC_ID_MACE6,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "mace6",
+         .long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 6:1"),
+     },
+     {
+         .id        = AV_CODEC_ID_VMDAUDIO,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "vmdaudio",
+         .long_name = NULL_IF_CONFIG_SMALL("Sierra VMD audio"),
+     },
+     {
+         .id        = AV_CODEC_ID_FLAC,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "flac",
+         .long_name = NULL_IF_CONFIG_SMALL("FLAC (Free Lossless Audio Codec)"),
+     },
+     {
+         .id        = AV_CODEC_ID_MP3ADU,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "mp3adu",
+         .long_name = NULL_IF_CONFIG_SMALL("ADU (Application Data Unit) MP3 (MPEG audio layer 3)"),
+     },
+     {
+         .id        = AV_CODEC_ID_MP3ON4,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "mp3on4",
+         .long_name = NULL_IF_CONFIG_SMALL("MP3onMP4"),
+     },
+     {
+         .id        = AV_CODEC_ID_SHORTEN,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "shorten",
+         .long_name = NULL_IF_CONFIG_SMALL("Shorten"),
+     },
+     {
+         .id        = AV_CODEC_ID_ALAC,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "alac",
+         .long_name = NULL_IF_CONFIG_SMALL("ALAC (Apple Lossless Audio Codec)"),
+     },
+     {
+         .id        = AV_CODEC_ID_WESTWOOD_SND1,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "westwood_snd1",
+         .long_name = NULL_IF_CONFIG_SMALL("Westwood Audio (SND1)"),
+     },
+     {
+         .id        = AV_CODEC_ID_GSM,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "gsm",
+         .long_name = NULL_IF_CONFIG_SMALL("GSM"),
+     },
+     {
+         .id        = AV_CODEC_ID_QDM2,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "qdm2",
+         .long_name = NULL_IF_CONFIG_SMALL("QDesign Music Codec 2"),
+     },
+     {
+         .id        = AV_CODEC_ID_COOK,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "cook",
+         .long_name = NULL_IF_CONFIG_SMALL("Cook / Cooker / Gecko (RealAudio G2)"),
+     },
+     {
+         .id        = AV_CODEC_ID_TRUESPEECH,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "truespeech",
+         .long_name = NULL_IF_CONFIG_SMALL("DSP Group TrueSpeech"),
+     },
+     {
+         .id        = AV_CODEC_ID_TTA,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "tta",
+         .long_name = NULL_IF_CONFIG_SMALL("TTA (True Audio)"),
+     },
+     {
+         .id        = AV_CODEC_ID_SMACKAUDIO,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "smackaudio",
+         .long_name = NULL_IF_CONFIG_SMALL("Smacker audio"),
+     },
+     {
+         .id        = AV_CODEC_ID_QCELP,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "qcelp",
+         .long_name = NULL_IF_CONFIG_SMALL("QCELP / PureVoice"),
+     },
+     {
+         .id        = AV_CODEC_ID_WAVPACK,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "wavpack",
+         .long_name = NULL_IF_CONFIG_SMALL("WavPack"),
+     },
+     {
+         .id        = AV_CODEC_ID_DSICINAUDIO,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "dsicinaudio",
+         .long_name = NULL_IF_CONFIG_SMALL("Delphine Software International CIN audio"),
+     },
+     {
+         .id        = AV_CODEC_ID_IMC,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "imc",
+         .long_name = NULL_IF_CONFIG_SMALL("IMC (Intel Music Coder)"),
+     },
+     {
+         .id        = AV_CODEC_ID_MUSEPACK7,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "musepack7",
+         .long_name = NULL_IF_CONFIG_SMALL("Musepack SV7"),
+     },
+     {
+         .id        = AV_CODEC_ID_MLP,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "mlp",
+         .long_name = NULL_IF_CONFIG_SMALL("MLP (Meridian Lossless Packing)"),
+     },
+     {
+         .id        = AV_CODEC_ID_GSM_MS,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "gsm_ms",
+         .long_name = NULL_IF_CONFIG_SMALL("GSM Microsoft variant"),
+     },
+     {
+         .id        = AV_CODEC_ID_ATRAC3,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "atrac3",
+         .long_name = NULL_IF_CONFIG_SMALL("Atrac 3 (Adaptive TRansform Acoustic Coding 3)"),
+     },
+     {
+         .id        = AV_CODEC_ID_VOXWARE,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "voxware",
+         .long_name = NULL_IF_CONFIG_SMALL("Voxware RT29 Metasound"),
+     },
+     {
+         .id        = AV_CODEC_ID_APE,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "ape",
+         .long_name = NULL_IF_CONFIG_SMALL("Monkey's Audio"),
+     },
+     {
+         .id        = AV_CODEC_ID_NELLYMOSER,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "nellymoser",
+         .long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao"),
+     },
+     {
+         .id        = AV_CODEC_ID_MUSEPACK8,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "musepack8",
+         .long_name = NULL_IF_CONFIG_SMALL("Musepack SV8"),
+     },
+     {
+         .id        = AV_CODEC_ID_SPEEX,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "speex",
+         .long_name = NULL_IF_CONFIG_SMALL("Speex"),
+     },
+     {
+         .id        = AV_CODEC_ID_WMAVOICE,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "wmavoice",
+         .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio Voice"),
+     },
+     {
+         .id        = AV_CODEC_ID_WMAPRO,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "wmapro",
+         .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 9 Professional"),
+     },
+     {
+         .id        = AV_CODEC_ID_WMALOSSLESS,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "wmalossless",
+         .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio Lossless"),
+     },
+     {
+         .id        = AV_CODEC_ID_ATRAC3P,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "atrac3p",
+         .long_name = NULL_IF_CONFIG_SMALL("Sony ATRAC3+"),
+     },
+     {
+         .id        = AV_CODEC_ID_EAC3,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "eac3",
+         .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52B (AC-3, E-AC-3)"),
+     },
+     {
+         .id        = AV_CODEC_ID_SIPR,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "sipr",
+         .long_name = NULL_IF_CONFIG_SMALL("RealAudio SIPR / ACELP.NET"),
+     },
+     {
+         .id        = AV_CODEC_ID_MP1,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "mp1",
+         .long_name = NULL_IF_CONFIG_SMALL("MP1 (MPEG audio layer 1)"),
+     },
+     {
+         .id        = AV_CODEC_ID_TWINVQ,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "twinvq",
+         .long_name = NULL_IF_CONFIG_SMALL("VQF TwinVQ"),
+     },
+     {
+         .id        = AV_CODEC_ID_TRUEHD,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "truehd",
+         .long_name = NULL_IF_CONFIG_SMALL("TrueHD"),
+     },
+     {
+         .id        = AV_CODEC_ID_MP4ALS,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "mp4als",
+         .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 Audio Lossless Coding (ALS)"),
+     },
+     {
+         .id        = AV_CODEC_ID_ATRAC1,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "atrac1",
+         .long_name = NULL_IF_CONFIG_SMALL("Atrac 1 (Adaptive TRansform Acoustic Coding)"),
+     },
+     {
+         .id        = AV_CODEC_ID_BINKAUDIO_RDFT,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "binkaudio_rdft",
+         .long_name = NULL_IF_CONFIG_SMALL("Bink Audio (RDFT)")
+     },
+     {
+         .id        = AV_CODEC_ID_BINKAUDIO_DCT,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "binkaudio_dct",
+         .long_name = NULL_IF_CONFIG_SMALL("Bink Audio (DCT)")
+     },
+     {
+         .id        = AV_CODEC_ID_AAC_LATM,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "aac_latm",
+         .long_name = NULL_IF_CONFIG_SMALL("AAC LATM (Advanced Audio Coding LATM syntax)"),
+     },
+     {
+         .id        = AV_CODEC_ID_QDMC,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "qdmc",
+         .long_name = NULL_IF_CONFIG_SMALL("QDesign Music"),
+     },
+     {
+         .id        = AV_CODEC_ID_CELT,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "celt",
+         .long_name = NULL_IF_CONFIG_SMALL("Constrained Energy Lapped Transform (CELT)"),
+     },
+     {
+         .id        = AV_CODEC_ID_G723_1,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "g723_1",
+         .long_name = NULL_IF_CONFIG_SMALL("G.723.1"),
+     },
+     {
+         .id        = AV_CODEC_ID_G729,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "g729",
+         .long_name = NULL_IF_CONFIG_SMALL("G.729"),
+     },
+     {
+         .id        = AV_CODEC_ID_8SVX_EXP,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "8svx_exp",
+         .long_name = NULL_IF_CONFIG_SMALL("8SVX exponential"),
+     },
+     {
+         .id        = AV_CODEC_ID_8SVX_FIB,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "8svx_fib",
+         .long_name = NULL_IF_CONFIG_SMALL("8SVX fibonacci"),
+     },
+     {
+         .id        = AV_CODEC_ID_BMV_AUDIO,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "bmv_audio",
+         .long_name = NULL_IF_CONFIG_SMALL("Discworld II BMV audio"),
+     },
+     {
+         .id        = AV_CODEC_ID_RALF,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "ralf",
+         .long_name = NULL_IF_CONFIG_SMALL("RealAudio Lossless"),
+     },
+     {
+         .id        = AV_CODEC_ID_IAC,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "iac",
+         .long_name = NULL_IF_CONFIG_SMALL("IAC (Indeo Audio Coder)"),
+     },
+     {
+         .id        = AV_CODEC_ID_ILBC,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "ilbc",
+         .long_name = NULL_IF_CONFIG_SMALL("iLBC (Internet Low Bitrate Codec)"),
+     },
+     /* subtitle codecs */
+     {
+         .id        = AV_CODEC_ID_DVD_SUBTITLE,
+         .type      = AVMEDIA_TYPE_SUBTITLE,
+         .name      = "dvd_subtitle",
+         .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"),
+     },
+     {
+         .id        = AV_CODEC_ID_DVB_SUBTITLE,
+         .type      = AVMEDIA_TYPE_SUBTITLE,
+         .name      = "dvb_subtitle",
+         .long_name = NULL_IF_CONFIG_SMALL("DVB subtitles"),
+     },
+     {
+         .id        = AV_CODEC_ID_TEXT,
+         .type      = AVMEDIA_TYPE_SUBTITLE,
+         .name      = "text",
+         .long_name = NULL_IF_CONFIG_SMALL("raw UTF-8 text"),
+     },
+     {
+         .id        = AV_CODEC_ID_XSUB,
+         .type      = AVMEDIA_TYPE_SUBTITLE,
+         .name      = "xsub",
+         .long_name = NULL_IF_CONFIG_SMALL("XSUB"),
+     },
+     {
+         .id        = AV_CODEC_ID_SSA,
+         .type      = AVMEDIA_TYPE_SUBTITLE,
+         .name      = "ssa",
+         .long_name = NULL_IF_CONFIG_SMALL("SSA (SubStation Alpha) / ASS (Advanced SSA) subtitle"),
+     },
+     {
+         .id        = AV_CODEC_ID_MOV_TEXT,
+         .type      = AVMEDIA_TYPE_SUBTITLE,
+         .name      = "mov_text",
+         .long_name = NULL_IF_CONFIG_SMALL("MOV text"),
+     },
+     {
+         .id        = AV_CODEC_ID_HDMV_PGS_SUBTITLE,
+         .type      = AVMEDIA_TYPE_SUBTITLE,
+         .name      = "hdmv_pgs_subtitle",
+         .long_name = NULL_IF_CONFIG_SMALL("HDMV Presentation Graphic Stream subtitles"),
+     },
+     {
+         .id        = AV_CODEC_ID_DVB_TELETEXT,
+         .type      = AVMEDIA_TYPE_SUBTITLE,
+         .name      = "dvb_teletext",
+         .long_name = NULL_IF_CONFIG_SMALL("DVB teletext"),
+     },
+     {
+         .id        = AV_CODEC_ID_SRT,
+         .type      = AVMEDIA_TYPE_SUBTITLE,
+         .name      = "srt",
+         .long_name = NULL_IF_CONFIG_SMALL("SubRip Text"),
+     },
+ };
+ const AVCodecDescriptor *avcodec_descriptor_get(enum AVCodecID id)
+ {
+     int i;
+     for (i = 0; i < FF_ARRAY_ELEMS(codec_descriptors); i++)
+         if (codec_descriptors[i].id == id)
+             return &codec_descriptors[i];
+     return NULL;
+ }
+ const AVCodecDescriptor *avcodec_descriptor_next(const AVCodecDescriptor *prev)
+ {
+     if (!prev)
+         return &codec_descriptors[0];
+     if (prev - codec_descriptors < FF_ARRAY_ELEMS(codec_descriptors) - 1)
+         return prev + 1;
+     return NULL;
+ }
@@@ -19,9 -19,6 +19,8 @@@
  #ifndef AVCODEC_OLD_CODEC_IDS_H
  #define AVCODEC_OLD_CODEC_IDS_H
  
- #include "libavutil/attributes.h"
 +#include "libavutil/common.h"
 +
  /*
   * This header exists to prevent new codec IDs from being accidentally added to
   * the deprecated list.
Simple merge
@@@ -1153,11 -1015,10 +1153,11 @@@ static void compute_pkt_fields(AVFormat
              st->cur_dts = pkt->dts;
      }
  
 -//    av_log(NULL, AV_LOG_ERROR, "OUTdelayed:%d/%d pts:%"PRId64", dts:%"PRId64" cur_dts:%"PRId64"\n", presentation_delayed, delay, pkt->pts, pkt->dts, st->cur_dts);
 +//    av_log(NULL, AV_LOG_ERROR, "OUTdelayed:%d/%d pts:%s, dts:%s cur_dts:%s\n",
 +//           presentation_delayed, delay, av_ts2str(pkt->pts), av_ts2str(pkt->dts), av_ts2str(st->cur_dts));
  
      /* update flags */
-     if(is_intra_only(st->codec))
 -    if (is_intra_only(st->codec->codec_id))
++    if (is_intra_only(st->codec))
          pkt->flags |= AV_PKT_FLAG_KEY;
      if (pc)
          pkt->convergence_duration = pc->convergence_duration;
Simple merge
Simple merge
  #include "config.h"
  #include "attributes.h"
  #include "timer.h"
 +#include "cpu.h"
  #include "dict.h"
  
- struct AVDictionary {
-     int count;
-     AVDictionaryEntry *elems;
- };
  #ifndef attribute_align_arg
  #if ARCH_X86_32 && AV_GCC_VERSION_AT_LEAST(4,2)
  #    define attribute_align_arg __attribute__((force_align_arg_pointer))
@@@ -39,8 -37,8 +39,8 @@@
   */
  
  #define LIBAVUTIL_VERSION_MAJOR 51
- #define LIBAVUTIL_VERSION_MINOR 67
 -#define LIBAVUTIL_VERSION_MINOR 38
 -#define LIBAVUTIL_VERSION_MICRO  0
++#define LIBAVUTIL_VERSION_MINOR 68
 +#define LIBAVUTIL_VERSION_MICRO 100
  
  #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                 LIBAVUTIL_VERSION_MINOR, \