diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-08 03:41:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-08 03:42:03 +0200 |
| commit | 7023715e888005f405a34ec1111d98cf3230bdaf (patch) | |
| tree | bf96ae523ed22a2888f8eb8a90d80f6d348d3aab /libavdevice/libdc1394.c | |
| parent | 5312c319be98c63b8e59695222a13068a0dbc7ab (diff) | |
| parent | 38e9585de993c32899588ab037180f2c930ce74c (diff) | |
| download | ffmpeg-7023715e888005f405a34ec1111d98cf3230bdaf.tar.gz | |
Merge commit '38e9585de993c32899588ab037180f2c930ce74c'
* commit '38e9585de993c32899588ab037180f2c930ce74c':
Makefile: Remove stray tabs
vp8: Wait for prev_frame to parse segment_map before reading it
yuv4mpeg: Correctly round chroma up for odd luma sizes
rmdec: Use the AVIOContext given as parameter in rm_read_metadata()
avio: Handle AVERROR_EOF in the same way as the return value 0
Conflicts:
libavformat/rmdec.c
libavformat/yuv4mpeg.c
No change as all the commits where already in before
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/libdc1394.c')
0 files changed, 0 insertions, 0 deletions