Michael Niedermayer 86b4dc6277 Merge commit 'bd255f9feb4deea4c990e582f0ba3b90d7b64b4c' ...

* commit 'bd255f9feb4deea4c990e582f0ba3b90d7b64b4c':
  lavc: set frame parameters after decoding only if necessary

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2012-12-14 15:30:12 +01:00

85 KiB

Raw Blame History

View Raw