Merge commit '17e9d52c8c93f47721ff481b8867922f4b4bd663'

Browse Source

* commit '17e9d52c8c93f47721ff481b8867922f4b4bd663':
  hevc_ps: remove a write-only variable

Conflicts:
	libavcodec/hevc_ps.c

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

pull/77/head

Michael Niedermayer 11 years ago

parent 9195c26d45 17e9d52c8c

commit f351afb5f9

Whitespace

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

Unified View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available