diff options
| author | Clément Bœsch <u@pkh.me> | 2016-06-22 19:57:11 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-06-22 19:57:11 +0200 |
| commit | 575be7311cff2c958ca289df408d3e9ce2e2b1c0 (patch) | |
| tree | c322202e0a64f71aee2d039e6a6c28799f4d790b /libswscale/alphablend.c | |
| parent | 541e1c2c3b7cf11c6c504dc03cd9b0559dfff3df (diff) | |
| parent | e4b38878da6b38ef5ca54ce14be985d6ae088834 (diff) | |
| download | ffmpeg-575be7311cff2c958ca289df408d3e9ce2e2b1c0.tar.gz | |
Merge commit 'e4b38878da6b38ef5ca54ce14be985d6ae088834'
* commit 'e4b38878da6b38ef5ca54ce14be985d6ae088834':
Move check_marker() from get_bits to mpeg4videodec
Not merged, check_marker() is used in various other places in FFmpeg.
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libswscale/alphablend.c')
0 files changed, 0 insertions, 0 deletions