Merge remote-tracking branch 'qatar/master'

Browse Source

* qatar/master:
  mpegvideo: allocate sufficiently large scratch buffer for interlaced vid

Conflicts:
	libavcodec/mpegvideo.c

See: 73db0bf1b0

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

pull/18/head

Michael Niedermayer 12 years ago

parent 1a0057dc88 259af1b923

commit 1ec578c010

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