Merge commit '65b8b6c476'

Browse source

* commit '65b8b6c476':
  hevc_filter: drop redundant checks

Conflicts:
	libavcodec/hevc_filter.c

No change as the removed checks where not in ffmpeg

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

...

This commit is contained in:

Michael Niedermayer 2014-08-09 20:48:53 +02:00

parent adba796eb4 65b8b6c476

commit ca80c65726

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

Download patch file Download diff file Expand all files Collapse all files

Diff content is not available