Context navigation

← Previous change
Next change →

Changeset 595 in SHVCSoftware for trunk/source/App/utils/BitrateTargeting/encodeCommand.sh

Timestamp:

2 Feb 2014, 06:01:53 (11 years ago)

Author:

seregin

Message:

merge with SHM-5.0-dev branch

Location:

Files:

: 3 edited

. (modified) (1 prop)
source (modified) (1 prop)
source/App/utils/BitrateTargeting/encodeCommand.sh (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk
- Property svn:mergeinfo changed
  /branches/SHM-5.0-dev merged: 591,593-594
trunk/source
- Property svn:mergeinfo changed
  /branches/SHM-5.0-dev/source merged: 593

trunk/source/App/utils/BitrateTargeting/encodeCommand.sh

r125	r595
6	6	# granted under this license.
7	7	#
8		# Copyright (c) 2010-2012, ITU/ISO/IEC
	8	# Copyright (c) 2010-2014, ITU/ISO/IEC
9	9	# All rights reserved.
10	10	#

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats: