diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-05 20:55:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-05 20:55:56 +0100 |
| commit | 22ad0546c8ab1728c69281145c92f3538d2408c1 (patch) | |
| tree | 74b4ec68da0067513ed17c2ce89fdcd3a764c325 /libavcodec/adpcmenc.c | |
| parent | 777179edb5ad3000e3c74d04db4f9affe1a170b6 (diff) | |
| parent | ad786dd450f26ecfbd35bb26e8b149664ecde049 (diff) | |
| download | ffmpeg-22ad0546c8ab1728c69281145c92f3538d2408c1.tar.gz | |
Merge commit 'ad786dd450f26ecfbd35bb26e8b149664ecde049'
* commit 'ad786dd450f26ecfbd35bb26e8b149664ecde049':
h264: remove a now redundant error check
Conflicts:
libavcodec/h264_slice.c
See: 64591f8f86f2dfeac13ee6b4e971d069675ca814
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adpcmenc.c')
0 files changed, 0 insertions, 0 deletions