• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · dd8ffc19
    Michael Niedermayer authored
    * qatar/master: (47 commits)
      lavc: hide private symbols.
      lavc: deprecate img_get_alpha_info().
      lavc: use avpriv_ prefix for ff_toupper4.
      lavc: use avpriv_ prefix for ff_copy_bits and align_put_bits.
      lavc: use avpriv_ prefix for ff_ac3_parse_header.
      lavc: use avpriv_ prefix for ff_frame_rate_tab.
      lavc: rename ff_find_start_code to avpriv_mpv_find_start_code
      lavc: use avpriv_ prefix for ff_split_xiph_headers.
      lavc: use avpriv_ prefix for ff_dirac_parse_sequence_header.
      lavc: use avpriv_ prefix for some dv symbols used in lavf.
      lavc: use avpriv_ prefix for some flac symbols used in lavf.
      lavc: use avpriv_ prefix for some mpeg4audio symbols used in lavf.
      lavc: use avpriv_ prefix for some mpegaudio symbols used in lavf.
      lavc: use avpriv_ prefix for ff_aac_parse_header().
      lavf: hide private symbols.
      lavf: use avpriv_ prefix for some dv functions.
      lavf: use avpriv_ prefix for ff_new_chapter().
      avcodec: add CODEC_CAP_DELAY note to avcodec_decode_audio3() documentation
      avcodec: clarify the CODEC_CAP_DELAY note in avcodec_decode_video2()
      avcodec: clarify documentation of CODEC_CAP_DELAY
      ...
    
    Conflicts:
    	configure
    	doc/general.texi
    	libavcodec/Makefile
    	libavcodec/aacdec.c
    	libavcodec/allcodecs.c
    	libavcodec/avcodec.h
    	libavcodec/dv.c
    	libavcodec/dvdata.c
    	libavcodec/dvdata.h
    	libavcodec/libspeexenc.c
    	libavcodec/mpegvideo.c
    	libavcodec/version.h
    	libavformat/avidec.c
    	libavformat/dv.c
    	libavformat/dv.h
    	libavformat/flvenc.c
    	libavformat/mov.c
    	libavformat/mp3enc.c
    	libavformat/oggparsespeex.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    dd8ffc19
asfdec.c 47.4 KB