diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-14 10:17:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-14 10:18:36 +0200 |
| commit | 8d9f08ef32f15678375847c4c21d208f8e9d1ebc (patch) | |
| tree | 4cb5cec336609382d6f5b719bcc6aaff951bbb01 /libavfilter/vf_subtitles.c | |
| parent | d794b7db1453ada81c49ae03e777250b5c2868c6 (diff) | |
| parent | 39185ec4faa9ef33954dbf2394444e045b632673 (diff) | |
| download | ffmpeg-8d9f08ef32f15678375847c4c21d208f8e9d1ebc.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
cavs: Check for negative cbp
Conflicts:
libavcodec/cavsdec.c
See: 9f06c1c61e876e930753da200bfe835817e30a53
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_subtitles.c')
0 files changed, 0 insertions, 0 deletions