highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
f66f3819b96847cd28589b718dbcd03b782e7a5c
ffmpeg/libavcodec/utils.c
Michael Niedermayer 78e150c5e9 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  hwaccel: Simplify ff_find_hwaccel

Conflicts:
	libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-10 17:37:51 +01:00

112 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink