diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-06 14:59:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-06 15:18:14 +0100 |
| commit | d168729004a949644f6268dbf5715ae92d43b0d2 (patch) | |
| tree | 4adbbb8899add9ca26603870ae98bbdb66ec9f1f /libavcodec/error_resilience.h | |
| parent | 2d99de66b7f1f805ae75d7502508ede18b52e95a (diff) | |
| parent | 713d3f98c8b0ff6cc86985d9e4d85e3f5b3c7004 (diff) | |
| download | ffmpeg-d168729004a949644f6268dbf5715ae92d43b0d2.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vf_shuffleplanes: fix the type of the mapping indices
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/error_resilience.h')
0 files changed, 0 insertions, 0 deletions