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>

...

This commit is contained in:

Michael Niedermayer 2013-05-17 12:05:50 +02:00

parent 1a0057dc88 259af1b923

commit 1ec578c010

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