Merge commit 'e1eaaec765d2e726618633fcbd2e06fded7647a8'

Browse Source

* commit 'e1eaaec765d2e726618633fcbd2e06fded7647a8':
  mjpegenc: remove commented out never-to-be-finished WIP cruft

Conflicts:
	libavcodec/mjpegenc.c

The unfinished 2-matrix code is left in place and not removed

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

pull/48/merge

Michael Niedermayer 11 years ago

parent 4a0d8277d5 e1eaaec765

commit 5ac5581132

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