• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 2e0c360a
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    2e0c360a
mpeg12.c 94.9 KB