eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-20 05:50:10 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
016c00cf68a481000f48ece6c11f622ba65e8045
ffmpeg/libavcodec/utils.c
Michael Niedermayer 12f203a098 Merge commit 'c24469e812501903a46a06eff9722a82e136e841' 
* commit 'c24469e812501903a46a06eff9722a82e136e841':
  utils: add workaround for AVHWAccel in ff_get_buffer compat code
  configure: Remove a stray msmpeg4v1 encoder declaration

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-27 11:42:15 +01:00

101 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink