diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-12 13:25:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-12 13:28:40 +0200 |
| commit | e9348e107bafcf0106c52f582d70fa53716b4ac4 (patch) | |
| tree | 7979a4ce08e622100a1fe345a2a9a199b4d3786c /ffserver.c | |
| parent | 9d47333e3eee1d9a31a98ebf67338463943846dc (diff) | |
| parent | e9d394f3fad7e8fd8fc80e3b33cb045bbaceb446 (diff) | |
| download | ffmpeg-streaming-e9348e107bafcf0106c52f582d70fa53716b4ac4.zip ffmpeg-streaming-e9348e107bafcf0106c52f582d70fa53716b4ac4.tar.gz | |
Merge commit 'e9d394f3fad7e8fd8fc80e3b33cb045bbaceb446'
* commit 'e9d394f3fad7e8fd8fc80e3b33cb045bbaceb446':
mlpdec: Do not set invalid context in read_restart_header
Conflicts:
libavcodec/mlpdec.c
See: a9cd12ee2afb3f3aad783c396816b23d8513f472
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions
