• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · b404ab9e
    Michael Niedermayer authored
    * qatar/master:
      mov: Don't av_malloc(0).
      avconv: only allocate 1 AVFrame per input stream
      avconv: fix memleaks due to not freeing the AVFrame for audio
      h264-fate: remove -strict 1 except where necessary (mr4/5-tandberg).
      misc Doxygen markup improvements
      doxygen: eliminate Qt-style doxygen syntax
      g722: Add a regression test for muxing/demuxing in wav
      g722: Change bits per sample to 4
      g722dec: Signal skipping the lower bits via AVOptions instead of bits_per_coded_sample
      api-example: update to use avcodec_decode_audio4()
      avplay: use avcodec_decode_audio4()
      avplay: use a separate buffer for playing silence
      avformat: use avcodec_decode_audio4() in avformat_find_stream_info()
      avconv: use avcodec_decode_audio4() instead of avcodec_decode_audio3()
      mov: Allow empty stts atom.
      doc: document preferred Doxygen syntax and make patcheck detect it
    
    Conflicts:
    	avconv.c
    	ffplay.c
    	libavcodec/mlpdec.c
    	libavcodec/version.h
    	libavformat/mov.c
    	tests/codec-regression.sh
    	tests/fate/h264.mak
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    b404ab9e
qcelpdata.h 19.8 KB