eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-22 05:51:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
a94de50ba02f5c260ca7c571b43fb595c8f951b6
ffmpeg/libavcodec/flvdec.c
Michael Niedermayer 6ee2911996 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavc: drop ff_pixfmt_list_420

Conflicts:
	libavcodec/flvdec.c
	libavcodec/msmpeg4dec.c
	libavcodec/rv10.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-23 03:56:43 +01:00

3.9 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink