eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 10:00:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
0f88a98b43b8ae41529a15c52b35b5d1bbef3197
ffmpeg/libavformat/smacker.c
Michael Niedermayer 3ed3aaab32 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  smacker: assign video frame PTS
  matroskadec: export full wavpack blocks.

Conflicts:
	libavcodec/wavpack.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28 11:58:46 +02:00

13 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink