• Michael Niedermayer's avatar
    Merge commit 'fd41cb43' · 82db8ee3
    Michael Niedermayer authored
    * commit 'fd41cb43':
      avconv: improve sample format negotiation for decoder request
      Opus encoder using libopus
      mpegts: Drop pointless casting of hex_dump_debug arguments
      avformat: const correctness for av_hex_dump / av_hex_dump_log
      wmadec: Adjust debug printf argument length modifier
    
    Conflicts:
    	Changelog
    	ffmpeg.c
    	libavcodec/libopusdec.c
    	libavcodec/version.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    82db8ee3
mpegts.c 70.9 KB