diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 04:06:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 04:11:37 +0100 |
| commit | abe3f79d62f4f6d0175310a01fa18935f8fae3ef (patch) | |
| tree | dfee16082fe6cbe6065204faa35ec43c4eebe0cb /libavcodec/vorbis_data.c | |
| parent | 8dc5a46466de29fd146599d99a19132a21253012 (diff) | |
| parent | 73eca738acd0770c4c415cba55371e984d27b03f (diff) | |
| download | ffmpeg-abe3f79d62f4f6d0175310a01fa18935f8fae3ef.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpeg12dec: do not add stereo3D side data to a non-existing frame
Conflicts:
libavcodec/mpeg12dec.c
See: fe285b04bbad23ddfac164e22034b5ee76e039a6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vorbis_data.c')
0 files changed, 0 insertions, 0 deletions