diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-18 14:02:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-18 14:02:31 +0200 |
| commit | 213e82b55c28d28860ec9a7ace8335df860a4c50 (patch) | |
| tree | d1996e13fdfd392ee530b2bea60c029acc0923c9 /libavcodec/dcadsp.c | |
| parent | 56d3cd1455ea1970165a3ca047a97c3e43a9e9aa (diff) | |
| parent | b513bf6f69e26e724de6d5dca642c3582dcd0517 (diff) | |
| download | ffmpeg-213e82b55c28d28860ec9a7ace8335df860a4c50.tar.gz | |
Merge commit 'b513bf6f69e26e724de6d5dca642c3582dcd0517'
* commit 'b513bf6f69e26e724de6d5dca642c3582dcd0517':
yuv4mpegdec: do not set coded_frame properties
Conflicts:
libavformat/yuv4mpegdec.c
See: b45a3e167f497d82effbf8ada453ea47b0ee21da
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dcadsp.c')
0 files changed, 0 insertions, 0 deletions