eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-21 14:30:10 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
0ebcf878032fa32a02e406a3397b51dc8b45109d
ffmpeg/libavcodec/ivi_common.c
Michael Niedermayer 357168bcf6 Merge commit '5ec6d152e26c570c0a16ec72c1f354db95708179' 
* commit '5ec6d152e26c570c0a16ec72c1f354db95708179':
  indeo4: B-frames decoding

Conflicts:
	libavcodec/ivi_common.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-27 02:05:22 +02:00

65 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink