dilim/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-07-25 00:37:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
ec79b1fc88b2cc6a9ab6cd953efcdbaebedde233
FFmpeg/libavdevice/fbdev.c
Michael Niedermayer 27ccc82e1b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavu,lavd: do not use av_pix_fmt_descriptors directly.

Conflicts:
	libavutil/imgutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-12 17:21:01 +02:00

9.1 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink