diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-19 11:11:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-19 11:22:26 +0200 |
| commit | 54e718d014e07f3e13432a605c6aa91e3cdd5977 (patch) | |
| tree | 78dbee55e6c7f1fa4ae39219ec21cff983ade869 /libavformat/yuv4mpeg.c | |
| parent | 037af63b33730808a89ecb5eab156b44c5018f30 (diff) | |
| parent | 9a27acae9e6b7d0bf74c5b878af9c42495a546f3 (diff) | |
| download | ffmpeg-54e718d014e07f3e13432a605c6aa91e3cdd5977.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ogg: Fix potential infinite discard loop
No change as this commit has been part of ffmpeg since a while already
See: d7b542ae294aaf818f2a00c5606e009cf931e77c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/yuv4mpeg.c')
0 files changed, 0 insertions, 0 deletions