• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 17106a7c
    Michael Niedermayer authored
    * qatar/master:
      audio_frame_queue: Clean up ff_af_queue_log_state debug function
      dwt: Remove unused code.
      cavs: convert cavsdata.h to a .c file
      cavs: Move inline functions only used in one file out of the header
      cavs: Move data tables used in only one place to that file
      fate: Add a single symbol Ut Video decoder test
      vf_hqdn3d: x86 asm
      vf_hqdn3d: support 16bit colordepth
      avconv: prefer user-forced input framerate when choosing output framerate
    
    Conflicts:
    	ffmpeg.c
    	libavcodec/audio_frame_queue.c
    	libavcodec/dwt.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    17106a7c
ffmpeg.c 108 KB