Merge commit '96dca089b19bf55293136277f5b081c56146e10e'

Browse Source

* commit '96dca089b19bf55293136277f5b081c56146e10e':
  qsvdec: move qsv_process_data() from qsvdec_h264 to the common code

Conflicts:
	libavcodec/qsvdec.c
	libavcodec/qsvdec_h264.c

No change as the parser code has been removed

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

pull/140/head

Michael Niedermayer 9 years ago

parent 62aab839f8 96dca089b1

commit a822c3bd79

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

Diff Content Not Available