virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-29 05:57:37 +02:00
Code Issues Releases Activity
Files
d58bcc1921f925b7094d4f2ee5df5b0c4e68bbe9
FFmpeg/libavcodec/c93.c
Michael Niedermayer 21c41e76d7 Merge commit 'cec5ce49229d61e4eb1f331a6d0dff3aa24f6655' 
* commit 'cec5ce49229d61e4eb1f331a6d0dff3aa24f6655':
  cdxl: remove an unused variable
  c93: use the AVFrame API properly.
  bethsoftvid: use the AVFrame API properly.
  avs: use the AVFrame API properly.

Conflicts:
	libavcodec/bethsoftvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-17 00:21:16 +01:00

8.5 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink