eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-15 03:20:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
12eeced8b41bbe46693f8c9625ed61b51f8438a1
ffmpeg/libavformat/mpegts.c
Michael Niedermayer 28c5775183 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mpegts: Make sure we don't return uninitialized packets
  gitignore: replace library catch-all pattern by more specific patterns

Conflicts:
	.gitignore

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-27 22:44:52 +02:00

74 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink