diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-10 15:47:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-10 16:00:57 +0200 |
| commit | 2e6338b47276bf66fc470a44e8c23a8e57daf07f (patch) | |
| tree | 31774db1582156b13a096b1449a1b08238d3ca65 /libavcodec/dxa.c | |
| parent | bc95b9428950cd672162bcb2bb98fbecad52a5b3 (diff) | |
| parent | 4ecdb5ed44591aba8a0ddb7d443cace836f761f6 (diff) | |
| download | ffmpeg-2e6338b47276bf66fc470a44e8c23a8e57daf07f.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
qdm2: Conceal broken samples
See: 5ee008e01d5a50d976b5f2a4abd6932185672d91
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dxa.c')
0 files changed, 0 insertions, 0 deletions