Merge commit '7ebfb466aec2c4628fcd42a72b29034efcaba4bc'

Browse Source

* commit '7ebfb466aec2c4628fcd42a72b29034efcaba4bc':
  h264: Don't store intra pcm samples in h->mb
  get_bits: Return pointer to buffer that is the result of the alignment

Conflicts:
	libavcodec/h264_mb_template.c

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

pull/10/head

Michael Niedermayer 12 years ago

parent dd37326345 7ebfb466ae

commit 98f63e1f34

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