eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 01:40:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
ab5d46df1656a23cb75b005a3d7730e189e38c4d
ffmpeg/libavformat/pmpdec.c
Michael Niedermayer 4a055f91be Merge commit '1b5d065ca722eb8028c7a08e054b6da3419faf5d' 
* commit '1b5d065ca722eb8028c7a08e054b6da3419faf5d':
  pmpdec: check that there is at least one audio packet.

Conflicts:
	libavformat/pmpdec.c

See: 8b1cd25ca7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-04 01:36:06 +01:00

6.0 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink