RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
68,680 Commits 36 Branches 392 Tags 307 MiB
Commit Graph

2 Commits

Author SHA1 Message Date
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
Nidhi Makhijani 2fc85fe96e bmv: Split audio and video decoder 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-07-06 10:58:43 -07:00