diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-22 14:54:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-22 15:33:23 +0100 |
| commit | 26345acb0e723d28aa28e09126ea383b2f679f5b (patch) | |
| tree | f8d7a9f62d7557aca5ad56dd244fa415fdab56f2 /libavformat/a64.c | |
| parent | 9774251c45eadfe0ba7b0381344451fa8840cc0d (diff) | |
| parent | 0881cbf314982cce8448bd12644ce2a6e0b8c576 (diff) | |
| download | ffmpeg-26345acb0e723d28aa28e09126ea383b2f679f5b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
proresdec: support mixed interlaced/non-interlaced content
vp3/5: move put_no_rnd_pixels_l2 from dsputil to VP3DSPContext.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/a64.c')
0 files changed, 0 insertions, 0 deletions