diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-26 14:07:04 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-26 14:24:57 +0200 |
commit | 507f2940ccdcedf2fdc064c5fb6022b60bace8ca (patch) | |
tree | a367ef88e7671ef3155d52bf0f8137fc1c2b0339 /Changelog | |
parent | 9f36ec6aa936515a703f6d7ff32826aa28684f1e (diff) | |
parent | 1b891d17c531e8a63c2974aab4bf997ce70746f3 (diff) | |
download | ffmpeg-507f2940ccdcedf2fdc064c5fb6022b60bace8ca.tar.gz |
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>
Diffstat (limited to 'Changelog')
0 files changed, 0 insertions, 0 deletions