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

Michael Niedermayer git at videolan.org
Tue Jun 3 01:26:23 CEST 2014


ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Tue Jun  3 01:17:01 2014 +0200| [2b40afae7004903197958139d3b011e22c3368d8] | committer: Michael Niedermayer

Merge commit 'ecf21ab0ec798eea96f862333568336098b4610c' into release/0.10

* commit 'ecf21ab0ec798eea96f862333568336098b4610c':
  cmdutils: update copyright year to 2014.
  ituh263: reject b-frame with pp_time = 0

Conflicts:
	cmdutils.c

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

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





More information about the ffmpeg-cvslog mailing list