eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-20 04:51:14 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
77e8bd8ce62a968b5ba318635f94de3dd8cce7eb
ffmpeg/libavcodec/mpeg12dec.c
Michael Niedermayer 0f4c03cd63 Merge commit '0989a120f1dec400c54fcb54670cb84bba36d99b' into release/2.2 
* commit '0989a120f1dec400c54fcb54670cb84bba36d99b':
  mpeg12: Always invoke the get_format() callback

Conflicts:
	libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-01 15:25:42 +01:00

104 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink