highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
dcda5ef1eab52a2392fd8f9ebf51a03052ddfce2
ffmpeg/libavformat/flvdec.c
Michael Niedermayer 419787a2ff Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  flv: Workaround for buggy Omnia A/XE encoder

Conflicts:
	libavformat/flvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-11 20:56:29 +01:00

36 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink