diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-19 23:32:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-19 23:32:51 +0200 |
| commit | 60b54e4b9fac8519bb68501b73ac0efbcce5cff0 (patch) | |
| tree | a9d2f4a934bd7c9c53fd6c277bca006adc28d1d5 /tests/copycooker.sh | |
| parent | ada49f936eaafe12365c7b962355d6dcfbfc4029 (diff) | |
| parent | e6d2b73784e5488d95c1ab76287f2eba9ca94d7d (diff) | |
| download | ffmpeg-60b54e4b9fac8519bb68501b73ac0efbcce5cff0.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: Set error code before before jumping to fail.
h264: fix PCM intra-coded blocks in monochrome case
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/copycooker.sh')
0 files changed, 0 insertions, 0 deletions