[FFmpeg-cvslog] Merge commit 'a335ffd7f4cdaaa6a8fe4187f6f06b0418eea19a' into release/0.10

Michael Niedermayer git at videolan.org
Thu Jan 17 02:31:03 CET 2013


ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 17 02:08:10 2013 +0100| [c961ce969a613e08c720cb6aa3cce4bd81cefe3f] | committer: Michael Niedermayer

Merge commit 'a335ffd7f4cdaaa6a8fe4187f6f06b0418eea19a' into release/0.10

* commit 'a335ffd7f4cdaaa6a8fe4187f6f06b0418eea19a':
  h264: fix sps parsing for SVC and CAVLC 4:4:4 Intra profiles
  h264: check sps.log2_max_frame_num for validity
  h264: slice-mt: get last_pic_dropable from master context
  ppc: always use pic for shared libraries
  h264: error out on unset current_picture_ptr for h->current_slice > 0
  flashsv: make sure data for zlib priming is available
  h264: enable low delay only if no delayed frames were seen
  flashsv: check for keyframe before using differential coding
  lavf: avoid integer overflow in ff_compute_frame_duration()
  aacdec: Fix an off-by-one overwrite when switching to LTP profile from MAIN.
  APIchanges: Fill in missing commit hashes

Conflicts:
	doc/APIchanges

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c961ce969a613e08c720cb6aa3cce4bd81cefe3f
---





More information about the ffmpeg-cvslog mailing list