diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-10 12:26:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-10 12:27:16 +0100 |
| commit | 65b8527993a1737eccc2820f27ed6bf10b63af5f (patch) | |
| tree | fcb0260594c58c9bb05d5a4e6a9294b6e38184bd /libavfilter/lavfutils.c | |
| parent | 8c7de73e20ebd0435f7ddd75d57ffb7179c40b77 (diff) | |
| parent | f7bf72a4a1146a7583577c9bdc066767e1ba3c6a (diff) | |
| download | ffmpeg-65b8527993a1737eccc2820f27ed6bf10b63af5f.tar.gz | |
Merge commit 'f7bf72a4a1146a7583577c9bdc066767e1ba3c6a'
* commit 'f7bf72a4a1146a7583577c9bdc066767e1ba3c6a':
idcinvideo: correctly set AVFrame defaults
yadif: Port inline assembly to yasm
au: remove unnecessary casts
au: return AVERROR codes instead of -1
Conflicts:
libavcodec/idcinvideo.c
libavfilter/x86/yadif_template.c
libavformat/au.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/lavfutils.c')
0 files changed, 0 insertions, 0 deletions