Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Apr 2012 20:52:01 +0000 (22:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Apr 2012 20:52:01 +0000 (22:52 +0200)
* qatar/master:
  cosmetics: Align muxer/demuxer declarations
  mpeg12: Do not change frame_pred_frame_dct flag and demote error into a warning
  avcodec: remove avcodec_guess_channel_layout()
  avutil: Add av_get_default_channel_layout()

Conflicts:
doc/APIchanges
libavcodec/mpeg12.c
libavformat/cdg.c
libavformat/matroskaenc.c
libavformat/mpegts.c
libavformat/nuv.c
libavformat/wav.c
libavutil/audioconvert.c
libavutil/audioconvert.h
libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
67 files changed:
1  2 
libavcodec/ac3enc.c
libavcodec/audioconvert.c
libavcodec/audioconvert.h
libavcodec/mpeg12.c
libavformat/a64.c
libavformat/aacdec.c
libavformat/ac3dec.c
libavformat/aea.c
libavformat/aiffdec.c
libavformat/aiffenc.c
libavformat/amr.c
libavformat/ape.c
libavformat/asfdec.c
libavformat/asfenc.c
libavformat/au.c
libavformat/avienc.c
libavformat/cafdec.c
libavformat/cdg.c
libavformat/daud.c
libavformat/dfa.c
libavformat/dtsdec.c
libavformat/dv.c
libavformat/filmstripdec.c
libavformat/flacdec.c
libavformat/flacenc.c
libavformat/flvdec.c
libavformat/flvenc.c
libavformat/ingenientdec.c
libavformat/iv8.c
libavformat/ivfdec.c
libavformat/ivfenc.c
libavformat/libnut.c
libavformat/matroskaenc.c
libavformat/movenc.c
libavformat/mp3dec.c
libavformat/mp3enc.c
libavformat/mpc.c
libavformat/mpeg.c
libavformat/mpegts.c
libavformat/mpegtsenc.c
libavformat/mvi.c
libavformat/mxg.c
libavformat/ncdec.c
libavformat/nullenc.c
libavformat/nutdec.c
libavformat/nutenc.c
libavformat/nuv.c
libavformat/pva.c
libavformat/rawdec.c
libavformat/rawenc.c
libavformat/rawvideodec.c
libavformat/rmenc.c
libavformat/rtpenc.c
libavformat/sapdec.c
libavformat/sapenc.c
libavformat/siff.c
libavformat/spdifdec.c
libavformat/spdifenc.c
libavformat/tmv.c
libavformat/tta.c
libavformat/vc1test.c
libavformat/vocdec.c
libavformat/vocenc.c
libavformat/wav.c
libavformat/yop.c
libavformat/yuv4mpeg.c
libavutil/avutil.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -73,6 -68,5 +73,6 @@@ AVInputFormat ff_cdg_demuxer = 
      .long_name      = NULL_IF_CONFIG_SMALL("CD Graphics Format"),
      .read_header    = read_header,
      .read_packet    = read_packet,
-     .flags= AVFMT_GENERIC_INDEX,
-     .extensions = "cdg"
++    .flags          = AVFMT_GENERIC_INDEX,
+     .extensions     = "cdg",
  };
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1342,7 -1326,7 +1342,7 @@@ AVOutputFormat ff_webm_muxer = 
      .write_header      = mkv_write_header,
      .write_packet      = mkv_write_packet,
      .write_trailer     = mkv_write_trailer,
-     .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT,
 -    .flags             = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
++    .flags             = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT,
  };
  #endif
  
@@@ -1362,6 -1346,7 +1362,6 @@@ AVOutputFormat ff_matroska_audio_muxer 
      .write_header      = mkv_write_header,
      .write_packet      = mkv_write_packet,
      .write_trailer     = mkv_write_trailer,
-     .flags = AVFMT_GLOBALHEADER,
+     .flags             = AVFMT_GLOBALHEADER,
 -    .codec_tag         = (const AVCodecTag* const []){ ff_codec_wav_tags, 0 },
  };
  #endif
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -2318,10 -2264,11 +2318,10 @@@ AVInputFormat ff_mpegts_demuxer = 
      .read_header    = mpegts_read_header,
      .read_packet    = mpegts_read_packet,
      .read_close     = mpegts_read_close,
 -    .read_seek      = read_seek,
 -    .read_timestamp = mpegts_get_pcr,
 +    .read_timestamp = mpegts_get_dts,
-     .flags = AVFMT_SHOW_IDS|AVFMT_TS_DISCONT,
+     .flags          = AVFMT_SHOW_IDS | AVFMT_TS_DISCONT,
  #ifdef USE_SYNCPOINT_SEARCH
-     .read_seek2 = read_seek2,
+     .read_seek2     = read_seek2,
  #endif
  };
  
@@@ -2332,10 -2279,11 +2332,10 @@@ AVInputFormat ff_mpegtsraw_demuxer = 
      .read_header    = mpegts_read_header,
      .read_packet    = mpegts_raw_read_packet,
      .read_close     = mpegts_read_close,
 -    .read_seek      = read_seek,
 -    .read_timestamp = mpegts_get_pcr,
 +    .read_timestamp = mpegts_get_dts,
-     .flags = AVFMT_SHOW_IDS|AVFMT_TS_DISCONT,
+     .flags          = AVFMT_SHOW_IDS | AVFMT_TS_DISCONT,
  #ifdef USE_SYNCPOINT_SEARCH
-     .read_seek2 = read_seek2,
+     .read_seek2     = read_seek2,
  #endif
-     .priv_class = &mpegtsraw_class,
+     .priv_class     = &mpegtsraw_class,
  };
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -340,6 -266,5 +340,6 @@@ AVInputFormat ff_nuv_demuxer = 
      .read_probe     = nuv_probe,
      .read_header    = nuv_header,
      .read_packet    = nuv_packet,
-     .flags = AVFMT_GENERIC_INDEX,
 +    .read_timestamp = nuv_read_dts,
+     .flags          = AVFMT_GENERIC_INDEX,
  };
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -700,9 -593,8 +700,9 @@@ AVInputFormat ff_wav_demuxer = 
      .read_header    = wav_read_header,
      .read_packet    = wav_read_packet,
      .read_seek      = wav_read_seek,
-     .flags= AVFMT_GENERIC_INDEX,
-     .codec_tag= (const AVCodecTag* const []){ff_codec_wav_tags, 0},
+     .flags          = AVFMT_GENERIC_INDEX,
+     .codec_tag      = (const AVCodecTag* const []){ ff_codec_wav_tags, 0 },
 +    .priv_class     = &wav_demuxer_class,
  };
  #endif /* CONFIG_WAV_DEMUXER */
  
Simple merge
Simple merge
   */
  
  #define LIBAVUTIL_VERSION_MAJOR 51
- #define LIBAVUTIL_VERSION_MINOR 44
 -#define LIBAVUTIL_VERSION_MINOR 26
 -#define LIBAVUTIL_VERSION_MICRO  0
++#define LIBAVUTIL_VERSION_MINOR 45
 +#define LIBAVUTIL_VERSION_MICRO 100
  
  #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                 LIBAVUTIL_VERSION_MINOR, \