diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 17:37:47 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 17:37:47 +0000 |
| commit | 8bbca8de394404772b1544ffd4c42e5731bf770f (patch) | |
| tree | 6c46410d8346b3590e086abf4d2a0986aa37c923 /libswscale | |
| parent | e7b8ec8b6fd85464da473d317593ba061529932c (diff) | |
| parent | 5781bfae0cf4271278a8bea176d615cb5c222335 (diff) | |
| download | ffmpeg-streaming-8bbca8de394404772b1544ffd4c42e5731bf770f.zip ffmpeg-streaming-8bbca8de394404772b1544ffd4c42e5731bf770f.tar.gz | |
Merge commit '5781bfae0cf4271278a8bea176d615cb5c222335'
This commit is a no-op.
* commit '5781bfae0cf4271278a8bea176d615cb5c222335':
flacenc: Load default prediction_order parameters if none is selected
asfdec: make sure packet_size is non-zero before seeking
asfdec: check for too small size in asf_read_unknown
asfdec: check avio_skip in asf_read_simple_index
asfdec: break if EOF is reached after asf_read_packet_header
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libswscale')
0 files changed, 0 insertions, 0 deletions
