• Michael Niedermayer's avatar
    Merge commit '1b891d17' · 507f2940
    Michael Niedermayer authored
    * commit '1b891d17':
      avconv: fix bitrate report when writing to /dev/null
      avfilter: fix graphparser memleaks on error paths
      rawdec: remove ff_raw_read_header
      pcmdec: remove dependency from rawdec
      g722: refactor out of rawdec.c
      rawvideo: use a specific read_header
    
    Conflicts:
    	ffmpeg.c
    	libavformat/Makefile
    	libavformat/rawdec.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    507f2940
g722.c 1.77 KB