Merge remote-tracking branch 'qatar/master'

Browse Source

* qatar/master:
  ac3dec: fix outptr increment.

Conflicts:
	libavcodec/ac3dec.c

No change as this has been fixed in ffmpeg head already

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

pull/44/head

Michael Niedermayer 12 years ago

parent 17e47ec8be 6c82c87dbb

commit 269b3c8799

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