diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-30 01:09:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-30 01:12:15 +0200 |
| commit | b6dfb829132d17d4a8188b06da3bc91dd951fb53 (patch) | |
| tree | 9a4ea31688e1c76ba0ff6c27cce49d1b20989181 /libavfilter/vf_overlay.c | |
| parent | a612bb3099eb0319567c3d682253782bee1d52de (diff) | |
| parent | 30db94dc399f6e4ef8905049d9b740556f0fce47 (diff) | |
| download | ffmpeg-streaming-b6dfb829132d17d4a8188b06da3bc91dd951fb53.zip ffmpeg-streaming-b6dfb829132d17d4a8188b06da3bc91dd951fb53.tar.gz | |
Merge commit '30db94dc399f6e4ef8905049d9b740556f0fce47'
* commit '30db94dc399f6e4ef8905049d9b740556f0fce47':
xan: Use bytestream2 to limit reading to within the buffer
Conflicts:
libavcodec/xan.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_overlay.c')
0 files changed, 0 insertions, 0 deletions
