eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 01:40:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
ae69c683e58c33f3489b39905ea15e8fdcd42a19
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