diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-03 01:56:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-03 01:56:47 +0100 |
| commit | 211372e86dbf73505bd981dec7ad755e0623d22d (patch) | |
| tree | 27a35eb4258535fae20b01dc57f5df8f1bcd3d78 /libavcodec/y41penc.c | |
| parent | 9c208b404cbd56ee4e217aa20e7e09ebfa21cfd5 (diff) | |
| parent | 0b300daad2f5cb59a7c06dde5ac701685e6edf16 (diff) | |
| download | ffmpeg-211372e86dbf73505bd981dec7ad755e0623d22d.tar.gz | |
Merge commit '0b300daad2f5cb59a7c06dde5ac701685e6edf16'
* commit '0b300daad2f5cb59a7c06dde5ac701685e6edf16':
h264: error out on unset current_picture_ptr for h->current_slice > 0
avprobe: report per stream bit rate if set by the decoder
aac: avoid a memcpy in sbr_qmf_analysis
Conflicts:
avprobe.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/y41penc.c')
0 files changed, 0 insertions, 0 deletions