virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-12-04 14:00:22 +02:00
Code Issues Releases Activity
Files
8102a097a5ce4b51fecd01b2615c518b1677a42a
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