diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-29 14:16:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-29 14:16:46 +0100 |
| commit | 9f8e2e92ae88841709ae1ffe71572ef7e5e865c7 (patch) | |
| tree | d7343c8a8eee0a42ae4c6bcc0ee6105ebacaa3d9 /libswscale/input.c | |
| parent | 52066bdb300b3a2cdef48897d0c864410b259084 (diff) | |
| parent | e4d349b4014ee2a03f521027e0bd1ace4a9e60bd (diff) | |
| download | ffmpeg-9f8e2e92ae88841709ae1ffe71572ef7e5e865c7.tar.gz | |
Merge commit 'e4d349b4014ee2a03f521027e0bd1ace4a9e60bd'
* commit 'e4d349b4014ee2a03f521027e0bd1ace4a9e60bd':
fate: h264: Add dependencies
fate: ea: Add dependencies
fate: Do not unconditionally run libavutil tests
rtpenc_chain: Remove unused variable
nuv: check for malloc failure when allocating extradata
nuv: use the stream indices generated by avformat_new_stream()
Conflicts:
tests/fate/ea.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/input.c')
0 files changed, 0 insertions, 0 deletions