Merge commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791'

Browse Source

* commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791':
  qsvdec: split off some code that will be shared with the encoder

Conflicts:
	libavcodec/Makefile
	libavcodec/qsvdec.h

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

pull/127/head

Michael Niedermayer 10 years ago

parent 151ae8ea5b d0a63d8b98

commit b12eacb383

7 changed files with 163 additions and 95 deletions

Whitespace

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

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Write Preview

Loading…

Cancel

Save