Merge commit 'bd255f9feb4deea4c990e582f0ba3b90d7b64b4c'

Browse Source

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

Conflicts:
	libavcodec/utils.c

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

...

This commit is contained in:

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

parent 3b5c0f5e36 bd255f9feb

commit 86b4dc6277

1 changed files with 8 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files