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