eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 01:40:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
7885fa7685c0085e42495482e6b79310f8d66dbc
ffmpeg/cmdutils.c
Michael Niedermayer 2f980cf39a Merge commit 'ff953fecffd3b9a616a046723fb9d4690be032a6' 
* commit 'ff953fecffd3b9a616a046723fb9d4690be032a6':
  lavc: set frame properties in ff_get_buffer().

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-05 15:58:07 +01:00

54 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink