Merge commit '2a06c2a03e1205aaeede5af850b9271752ddd4cf'

Browse Source

* commit '2a06c2a03e1205aaeede5af850b9271752ddd4cf':
  mpegvideo_enc: Draw edges on input for non-multiple of 16 resolutions

Conflicts:
	libavcodec/mpegvideo_enc.c

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

pull/105/head

Michael Niedermayer 10 years ago

parent 72d99c8c26 2a06c2a03e

commit e40cdf8604

1 changed files with 2 additions and 2 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