diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-26 22:37:37 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-26 22:37:37 +0200 |
commit | 53ce9905134e042516ddd7a4476dc668c0b094c4 (patch) | |
tree | 05e80abb4ef8b78c7c93bc920b32fb34ac268cc7 /Changelog | |
parent | a48b890392aa22033f182421ba9e3f3b3256461d (diff) | |
parent | 154486f9adc621e620dacd76d78c30a02cc1dcd3 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
opt: Add av_opt_set_bin()
avconv: Display the error returned by avformat_write_header
rtpenc_chain: Return an error code instead of just a plain pointer
rtpenc_chain: Free the URLContext on failure
rtpenc: Expose the ssrc as an avoption
avprobe: display the codec profile in show_stream()
avprobe: fix function prototype
cosmetics: Fix indentation
avprobe: changelog entry
avprobe: update documentation
avprobe: provide JSON output
avprobe: output proper INI format
avprobe: improve formatting
rtmp: fix url parsing
fate: document TARGET_EXEC and its usage
Conflicts:
doc/APIchanges
doc/fate.texi
doc/ffprobe.texi
ffprobe.c
libavformat/version.h
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Changelog')
-rw-r--r-- | Changelog | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -44,7 +44,7 @@ Fixes:CVE-2012-2772, CVE-2012-2774, CVE-2012-2775, CVE-2012-2776, CVE-2012-2777, - vorbis parser - png parser - audio mix filter - +- avprobe output is now standard INI or JSON. version 0.10: - Fixes: CVE-2011-3929, CVE-2011-3934, CVE-2011-3935, CVE-2011-3936, |