Merge commit 'b82722df9b2911bd41e0928db4804067b39e6528'

Browse Source

* commit 'b82722df9b2911bd41e0928db4804067b39e6528':
  hevc: reindent after previous commit

Conflicts:
	libavcodec/hevc.c

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

...

This commit is contained in:

Michael Niedermayer 2015-01-27 14:21:49 +01:00

parent 4e40e61287 b82722df9b

commit 2d4b8af4f6

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

Diff Content Not Available