diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-04 01:35:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-04 01:36:06 +0100 |
| commit | 4a055f91bec2f746517ec7757e2b2a3bbdb90027 (patch) | |
| tree | 7f3b3f15f392a8448414cd571fdc19de80e41952 /libavcodec/lzw.c | |
| parent | 3929c17405e010896e56b7791084ffd9fcee3a3d (diff) | |
| parent | 1b5d065ca722eb8028c7a08e054b6da3419faf5d (diff) | |
| download | ffmpeg-4a055f91bec2f746517ec7757e2b2a3bbdb90027.tar.gz | |
Merge commit '1b5d065ca722eb8028c7a08e054b6da3419faf5d'
* commit '1b5d065ca722eb8028c7a08e054b6da3419faf5d':
pmpdec: check that there is at least one audio packet.
Conflicts:
libavformat/pmpdec.c
See: 8b1cd25ca7e64e6128fa2902d78e48bfeeec9786
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/lzw.c')
0 files changed, 0 insertions, 0 deletions