diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-17 03:03:39 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-17 03:03:39 +0100 |
commit | 3f1a58db6f7a35a86190ff5897cb424b03a97870 (patch) | |
tree | 807fdf06a433f180d120ddf22bfc755df514cad1 /libavformat/rtmpproto.c | |
parent | 597d709eb42ae0fbe9e4b97fb1a5c04544fdb04b (diff) | |
parent | b143844ea0f6246e0d5a938d743e2e8a98453bec (diff) | |
download | ffmpeg-3f1a58db6f7a35a86190ff5897cb424b03a97870.tar.gz |
Merge commit 'b143844ea0f6246e0d5a938d743e2e8a98453bec' into release/0.8
* commit 'b143844ea0f6246e0d5a938d743e2e8a98453bec': (22 commits)
aacdec: Fix an off-by-one overwrite when switching to LTP profile from MAIN.
vp6: properly fail on unsupported feature
h264: Fix parameters to ff_er_add_slice() call
flacenc: ensure the order is within the min/max range in LPC order search
yuv4mpeg: reject unsupported codecs
vp8: reset loopfilter delta values at keyframes.
vp56: release frames on error
vp56: make parse_header return standard error codes
ivi_common: check that scan pattern is set before using it.
Update RELEASE file for 0.7.7
tiffenc: Check av_malloc() results.
mpegaudiodec: fix short_start calculation
h264: avoid stuck buffer pointer in decode_nal_units
yuv4mpeg: return proper error codes.
smacker audio: sign-extend the initial 16-bit predicted value
vf_pad: don't give up its own reference to the output buffer.
avidec: return 0, not packet size from read_packet().
wmapro: prevent division by zero when sample rate is unspecified
alsdec: fix number of decoded samples in first sub-block in BGMC mode.
alsdec: remove dead assignments
...
Conflicts:
RELEASE
libavformat/avidec.c
libavformat/yuv4mpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmpproto.c')
0 files changed, 0 insertions, 0 deletions