Merge commit '1b891d17c531e8a63c2974aab4bf997ce70746f3'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Oct 2012 12:07:04 +0000 (14:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Oct 2012 12:24:57 +0000 (14:24 +0200)
commit507f2940ccdcedf2fdc064c5fb6022b60bace8ca
treea367ef88e7671ef3155d52bf0f8137fc1c2b0339
parent9f36ec6aa936515a703f6d7ff32826aa28684f1e
parent1b891d17c531e8a63c2974aab4bf997ce70746f3
Merge commit '1b891d17c531e8a63c2974aab4bf997ce70746f3'

* commit '1b891d17c531e8a63c2974aab4bf997ce70746f3':
  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: Michael Niedermayer <michaelni@gmx.at>
ffmpeg.c
libavfilter/graphparser.c
libavformat/Makefile
libavformat/g722.c
libavformat/pcmdec.c
libavformat/rawdec.c
libavformat/rawdec.h
libavformat/rawvideodec.c