generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Files
83f18410bdcf149b58fb669cda65b1cdcdebf695
ffmpeg/libavcodec/bmvaudio.c
Michael Niedermayer 96761e9306 Merge commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58' 
* commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58':
  bmv: Split audio and video decoder

Conflicts:
	libavcodec/bmvvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-06 23:43:37 +02:00

2.8 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink