ffmpeg.git
6 years agoMerge commit '58c120a9290eef057dbf26761a4f89b7f67bbde1'
Michael Niedermayer [Sat, 30 Nov 2013 03:21:45 +0000 (04:21 +0100)]
Merge commit '58c120a9290eef057dbf26761a4f89b7f67bbde1'

* commit '58c120a9290eef057dbf26761a4f89b7f67bbde1':
  mpeg4videodec: move scalability from MpegEncContext to Mpeg4DecContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6e81597d5a89f64dfab5c7e99e46b4355139e324'
Michael Niedermayer [Sat, 30 Nov 2013 03:15:41 +0000 (04:15 +0100)]
Merge commit '6e81597d5a89f64dfab5c7e99e46b4355139e324'

* commit '6e81597d5a89f64dfab5c7e99e46b4355139e324':
  mpeg4videodec: move enhancement_type from MpegEncContext to Mpeg4DecContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5'
Michael Niedermayer [Sat, 30 Nov 2013 03:02:11 +0000 (04:02 +0100)]
Merge commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5'

* commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5':
  mpeg4videodec: remove a write-only variable from MpegEncContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '3b1c0f686d5a162ceb5048910a7ce0bf7ed3a1ab'
Michael Niedermayer [Sat, 30 Nov 2013 02:54:35 +0000 (03:54 +0100)]
Merge commit '3b1c0f686d5a162ceb5048910a7ce0bf7ed3a1ab'

* commit '3b1c0f686d5a162ceb5048910a7ce0bf7ed3a1ab':
  mpeg4videodec: move new_pred from MpegEncContext to Mpeg4DecContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e89247debd5276d57ce4a26516224204f9541af0'
Michael Niedermayer [Sat, 30 Nov 2013 02:46:49 +0000 (03:46 +0100)]
Merge commit 'e89247debd5276d57ce4a26516224204f9541af0'

* commit 'e89247debd5276d57ce4a26516224204f9541af0':
  mpeg4videodec: replace MpegEncContext.reduced_res_vop with a local variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8cebc9eaac8631adb23dd1e46c37ad8474139a07'
Michael Niedermayer [Sat, 30 Nov 2013 02:39:56 +0000 (03:39 +0100)]
Merge commit '8cebc9eaac8631adb23dd1e46c37ad8474139a07'

* commit '8cebc9eaac8631adb23dd1e46c37ad8474139a07':
  mpeg4videodec: remove a write-only variable from MpegEncContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b1aacd56685cd131f517e0551834a0bbd3f5f809'
Michael Niedermayer [Sat, 30 Nov 2013 02:20:05 +0000 (03:20 +0100)]
Merge commit 'b1aacd56685cd131f517e0551834a0bbd3f5f809'

* commit 'b1aacd56685cd131f517e0551834a0bbd3f5f809':
  mpeg4videodec: move t_frame from MpegEncContext to Mpeg4DecContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompeg4_update_thread_context: copy the whole mpeg4 specific context instead of variabl...
Michael Niedermayer [Sat, 30 Nov 2013 02:11:56 +0000 (03:11 +0100)]
mpeg4_update_thread_context: copy the whole mpeg4 specific context instead of variables one by one

This simplifies the code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '038890740014dc33d2e2f04da7cf0a9da821264e'
Michael Niedermayer [Sat, 30 Nov 2013 02:11:16 +0000 (03:11 +0100)]
Merge commit '038890740014dc33d2e2f04da7cf0a9da821264e'

* commit '038890740014dc33d2e2f04da7cf0a9da821264e':
  mpeg4videodec: move cplx_estimation_* fields from MpegEncContext to Mpeg4DecContext

Conflicts:
libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpeg4videodec: update bug workaround related variables like they where before
Michael Niedermayer [Sat, 30 Nov 2013 02:00:53 +0000 (03:00 +0100)]
avcodec/mpeg4videodec: update bug workaround related variables like they where before

This fixes the code after the variables have been moved into the
mpeg4 decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '43af264de8606668c6b2fa7f96c946bdc3dbe072'
Michael Niedermayer [Sat, 30 Nov 2013 01:52:09 +0000 (02:52 +0100)]
Merge commit '43af264de8606668c6b2fa7f96c946bdc3dbe072'

* commit '43af264de8606668c6b2fa7f96c946bdc3dbe072':
  mpeg4videodec: move mpeg4-specific bug workaround variables from MpegEncContext to Mpeg4DecContext

Conflicts:
libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e2ceb17642f374a7df8f1f5d3d2b2446525bc7fb'
Michael Niedermayer [Sat, 30 Nov 2013 01:42:56 +0000 (02:42 +0100)]
Merge commit 'e2ceb17642f374a7df8f1f5d3d2b2446525bc7fb'

* commit 'e2ceb17642f374a7df8f1f5d3d2b2446525bc7fb':
  mpeg4videodec: move mpeg4-specific post-frame-decode code from h264dec to mpeg4videodec

Conflicts:
libavcodec/h263dec.c
libavcodec/mpeg4video.h
libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h263dec: move call to ff_mpeg4_workaround_bugs() under codec_id check
Michael Niedermayer [Sat, 30 Nov 2013 01:35:13 +0000 (02:35 +0100)]
avcodec/h263dec: move call to ff_mpeg4_workaround_bugs() under codec_id check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b452d5ae866942cec00aa1432fe29498b38b49fc'
Michael Niedermayer [Sat, 30 Nov 2013 01:25:51 +0000 (02:25 +0100)]
Merge commit 'b452d5ae866942cec00aa1432fe29498b38b49fc'

* commit 'b452d5ae866942cec00aa1432fe29498b38b49fc':
  mpeg4videodec: move mpeg4-specific bug detection from h263 generic code to mpeg4

Conflicts:
libavcodec/h263dec.c

not merged, the header decode function is not the right place
See: 6c9b82b6a0d5cbdf90dcbf9f4e1c77ae82c5698f

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpeg4videodec: move bug workaround code into seperate function
Michael Niedermayer [Sat, 30 Nov 2013 01:00:50 +0000 (02:00 +0100)]
avcodec/mpeg4videodec: move bug workaround code into seperate function

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '48e139409556861c9e561ce34133891d8eecc3cf'
Michael Niedermayer [Fri, 29 Nov 2013 23:58:58 +0000 (00:58 +0100)]
Merge commit '48e139409556861c9e561ce34133891d8eecc3cf'

* commit '48e139409556861c9e561ce34133891d8eecc3cf':
  mpeg4videodec: move MpegEncContext.resync_marker into Mpeg4DecContext.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh263: remove unused ff_h263_find_resync_marker()
Michael Niedermayer [Fri, 29 Nov 2013 23:58:33 +0000 (00:58 +0100)]
h263: remove unused ff_h263_find_resync_marker()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c2f7417eeb9cc31f75e71f7be2780f90f1628d7e'
Michael Niedermayer [Fri, 29 Nov 2013 23:48:01 +0000 (00:48 +0100)]
Merge commit 'c2f7417eeb9cc31f75e71f7be2780f90f1628d7e'

* commit 'c2f7417eeb9cc31f75e71f7be2780f90f1628d7e':
  vc1: move MpegEncContext.resync_marker into VC1Context.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a5a71992cae34b321ceb8374f44ce17a945a3881'
Michael Niedermayer [Fri, 29 Nov 2013 22:53:57 +0000 (23:53 +0100)]
Merge commit 'a5a71992cae34b321ceb8374f44ce17a945a3881'

* commit 'a5a71992cae34b321ceb8374f44ce17a945a3881':
  mpeg4videoenc: don't set MpegEncContext.resync_marker

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ad09f52586eae4c5473c3a6a803d73e1ba56c0eb'
Michael Niedermayer [Fri, 29 Nov 2013 22:46:30 +0000 (23:46 +0100)]
Merge commit 'ad09f52586eae4c5473c3a6a803d73e1ba56c0eb'

* commit 'ad09f52586eae4c5473c3a6a803d73e1ba56c0eb':
  h263dec: remove commented out cruft

Conflicts:
libavcodec/h263dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpeg4videodec: copy rvlc in mpeg4_update_thread_context too
Michael Niedermayer [Fri, 29 Nov 2013 22:40:15 +0000 (23:40 +0100)]
avcodec/mpeg4videodec: copy rvlc in mpeg4_update_thread_context too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'bc5abfb19e7ff00b859120561d6ffd622c7904fe'
Michael Niedermayer [Fri, 29 Nov 2013 22:26:07 +0000 (23:26 +0100)]
Merge commit 'bc5abfb19e7ff00b859120561d6ffd622c7904fe'

* commit 'bc5abfb19e7ff00b859120561d6ffd622c7904fe':
  mpeg4videodec: move MpegEncContext.rvlc to Mpeg4DecContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9f0617d2137bb7231b181d74392cd84ef4844cd7'
Michael Niedermayer [Fri, 29 Nov 2013 22:20:19 +0000 (23:20 +0100)]
Merge commit '9f0617d2137bb7231b181d74392cd84ef4844cd7'

* commit '9f0617d2137bb7231b181d74392cd84ef4844cd7':
  mpeg4videodec: remove write-only sprite variables from MpegEncContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpeg4videodec: Fix code so it also works after moving vol_sprite_usage around
Michael Niedermayer [Fri, 29 Nov 2013 22:13:54 +0000 (23:13 +0100)]
avcodec/mpeg4videodec: Fix code so it also works after moving vol_sprite_usage around

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1a89025793ca73d9685a8ce8e3194efa64dd6844'
Michael Niedermayer [Fri, 29 Nov 2013 22:04:13 +0000 (23:04 +0100)]
Merge commit '1a89025793ca73d9685a8ce8e3194efa64dd6844'

* commit '1a89025793ca73d9685a8ce8e3194efa64dd6844':
  mpeg4videodec: move MpegEncContext.vol_sprite_usage to Mpeg4DecContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '75bd07f732fb575c2b88dc7cd08a6bb12c2e24ea'
Michael Niedermayer [Fri, 29 Nov 2013 21:58:09 +0000 (22:58 +0100)]
Merge commit '75bd07f732fb575c2b88dc7cd08a6bb12c2e24ea'

* commit '75bd07f732fb575c2b88dc7cd08a6bb12c2e24ea':
  mpeg4videoenc: write 0 instead of vol_sprite_usage

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e62a43f6b1a9c0c82e1df33c0c038e32029c0aa4'
Michael Niedermayer [Fri, 29 Nov 2013 21:44:27 +0000 (22:44 +0100)]
Merge commit 'e62a43f6b1a9c0c82e1df33c0c038e32029c0aa4'

* commit 'e62a43f6b1a9c0c82e1df33c0c038e32029c0aa4':
  mpeg4videodec: move MpegEncContext.time_increment_bits to Mpeg4DecContext

Conflicts:
libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ee8af2dd99dcb7a01a667deedec81d1aa2a00d72'
Michael Niedermayer [Fri, 29 Nov 2013 21:35:52 +0000 (22:35 +0100)]
Merge commit 'ee8af2dd99dcb7a01a667deedec81d1aa2a00d72'

* commit 'ee8af2dd99dcb7a01a667deedec81d1aa2a00d72':
  mpeg4videodec: move MpegEncContext.shape to Mpeg4DecContext

Conflicts:
libavcodec/h263dec.c
libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '35e0833d410e31d9fd35695ad798c5d13de2af58'
Michael Niedermayer [Fri, 29 Nov 2013 21:27:28 +0000 (22:27 +0100)]
Merge commit '35e0833d410e31d9fd35695ad798c5d13de2af58'

* commit '35e0833d410e31d9fd35695ad798c5d13de2af58':
  mpeg4videodec: add a mpeg4-specific private context.

Conflicts:
libavcodec/mpeg4video_parser.c
libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '95fd52c11bff1aad93a29aed3bd5472bd2981d1f'
Michael Niedermayer [Fri, 29 Nov 2013 21:12:36 +0000 (22:12 +0100)]
Merge commit '95fd52c11bff1aad93a29aed3bd5472bd2981d1f'

* commit '95fd52c11bff1aad93a29aed3bd5472bd2981d1f':
  mxfdec: set extradata size

Conflicts:
libavformat/mxfdec.c

no change as ffmpeg was not affected by this bug

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompeg4videodec: move scalability from MpegEncContext to Mpeg4DecContext
Anton Khirnov [Tue, 26 Nov 2013 13:34:52 +0000 (14:34 +0100)]
mpeg4videodec: move scalability from MpegEncContext to Mpeg4DecContext

6 years agompeg4videodec: move enhancement_type from MpegEncContext to Mpeg4DecContext
Anton Khirnov [Tue, 26 Nov 2013 13:34:52 +0000 (14:34 +0100)]
mpeg4videodec: move enhancement_type from MpegEncContext to Mpeg4DecContext

6 years agompeg4videodec: remove a write-only variable from MpegEncContext
Anton Khirnov [Tue, 26 Nov 2013 13:45:14 +0000 (14:45 +0100)]
mpeg4videodec: remove a write-only variable from MpegEncContext

6 years agompeg4videodec: move new_pred from MpegEncContext to Mpeg4DecContext
Anton Khirnov [Tue, 26 Nov 2013 13:34:52 +0000 (14:34 +0100)]
mpeg4videodec: move new_pred from MpegEncContext to Mpeg4DecContext

6 years agompeg4videodec: replace MpegEncContext.reduced_res_vop with a local variable
Anton Khirnov [Tue, 26 Nov 2013 13:34:52 +0000 (14:34 +0100)]
mpeg4videodec: replace MpegEncContext.reduced_res_vop with a local variable

6 years agoRELEASE: update to 2.1.git
Timothy Gu [Fri, 29 Nov 2013 01:00:27 +0000 (17:00 -0800)]
RELEASE: update to 2.1.git

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompeg4videodec: remove a write-only variable from MpegEncContext
Anton Khirnov [Tue, 26 Nov 2013 13:40:21 +0000 (14:40 +0100)]
mpeg4videodec: remove a write-only variable from MpegEncContext

6 years agompeg4videodec: move t_frame from MpegEncContext to Mpeg4DecContext
Anton Khirnov [Tue, 26 Nov 2013 13:34:52 +0000 (14:34 +0100)]
mpeg4videodec: move t_frame from MpegEncContext to Mpeg4DecContext

6 years agompeg4videodec: move cplx_estimation_* fields from MpegEncContext to Mpeg4DecContext
Anton Khirnov [Tue, 26 Nov 2013 13:34:52 +0000 (14:34 +0100)]
mpeg4videodec: move cplx_estimation_* fields from MpegEncContext to Mpeg4DecContext

6 years agompeg4videodec: move mpeg4-specific bug workaround variables from MpegEncContext to...
Anton Khirnov [Tue, 26 Nov 2013 13:30:13 +0000 (14:30 +0100)]
mpeg4videodec: move mpeg4-specific bug workaround variables from MpegEncContext to Mpeg4DecContext

6 years agompeg4videodec: move mpeg4-specific post-frame-decode code from h264dec to mpeg4videodec
Anton Khirnov [Tue, 26 Nov 2013 13:22:10 +0000 (14:22 +0100)]
mpeg4videodec: move mpeg4-specific post-frame-decode code from h264dec to mpeg4videodec

6 years agompeg4videodec: move mpeg4-specific bug detection from h263 generic code to mpeg4
Anton Khirnov [Tue, 26 Nov 2013 11:40:13 +0000 (12:40 +0100)]
mpeg4videodec: move mpeg4-specific bug detection from h263 generic code to mpeg4

6 years agompeg4videodec: move MpegEncContext.resync_marker into Mpeg4DecContext.
Anton Khirnov [Tue, 26 Nov 2013 11:18:44 +0000 (12:18 +0100)]
mpeg4videodec: move MpegEncContext.resync_marker into Mpeg4DecContext.

6 years agovc1: move MpegEncContext.resync_marker into VC1Context.
Anton Khirnov [Tue, 26 Nov 2013 11:18:44 +0000 (12:18 +0100)]
vc1: move MpegEncContext.resync_marker into VC1Context.

The field still remains in MpegEncContext because it is used by the
mpeg4 decoder.

6 years agompeg4videoenc: don't set MpegEncContext.resync_marker
Anton Khirnov [Tue, 26 Nov 2013 11:14:13 +0000 (12:14 +0100)]
mpeg4videoenc: don't set MpegEncContext.resync_marker

It is only used in one place immediately after it is set.

6 years agoh263dec: remove commented out cruft
Anton Khirnov [Tue, 26 Nov 2013 10:52:54 +0000 (11:52 +0100)]
h263dec: remove commented out cruft

6 years agompeg4videodec: move MpegEncContext.rvlc to Mpeg4DecContext
Anton Khirnov [Tue, 26 Nov 2013 10:23:16 +0000 (11:23 +0100)]
mpeg4videodec: move MpegEncContext.rvlc to Mpeg4DecContext

6 years agompeg4videodec: remove write-only sprite variables from MpegEncContext
Anton Khirnov [Tue, 26 Nov 2013 10:48:51 +0000 (11:48 +0100)]
mpeg4videodec: remove write-only sprite variables from MpegEncContext

6 years agompeg4videodec: move MpegEncContext.vol_sprite_usage to Mpeg4DecContext
Anton Khirnov [Tue, 26 Nov 2013 10:23:16 +0000 (11:23 +0100)]
mpeg4videodec: move MpegEncContext.vol_sprite_usage to Mpeg4DecContext

6 years agompeg4videoenc: write 0 instead of vol_sprite_usage
Anton Khirnov [Tue, 26 Nov 2013 10:37:59 +0000 (11:37 +0100)]
mpeg4videoenc: write 0 instead of vol_sprite_usage

That field is never set for encoding.

6 years agompeg4videodec: move MpegEncContext.time_increment_bits to Mpeg4DecContext
Anton Khirnov [Tue, 26 Nov 2013 10:23:16 +0000 (11:23 +0100)]
mpeg4videodec: move MpegEncContext.time_increment_bits to Mpeg4DecContext

The field remains in MpegEncContext for use in the encoder.

6 years agompeg4videodec: move MpegEncContext.shape to Mpeg4DecContext
Anton Khirnov [Tue, 26 Nov 2013 10:23:16 +0000 (11:23 +0100)]
mpeg4videodec: move MpegEncContext.shape to Mpeg4DecContext

6 years agompeg4videodec: add a mpeg4-specific private context.
Anton Khirnov [Tue, 26 Nov 2013 09:41:57 +0000 (10:41 +0100)]
mpeg4videodec: add a mpeg4-specific private context.

6 years agomxfdec: set extradata size
Anton Khirnov [Tue, 26 Nov 2013 14:41:12 +0000 (15:41 +0100)]
mxfdec: set extradata size

The line setting it was mistakenly removed in
ecf442a58b09bdb1dc1d2c3904b82ac5f79b2878

6 years agoavcodec/dcadec: decode LFE so we dont just add random data when downmixing with LFE
Michael Niedermayer [Fri, 29 Nov 2013 13:07:34 +0000 (14:07 +0100)]
avcodec/dcadec: decode LFE so we dont just add random data when downmixing with LFE

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffserver: improve error feedback in case of write_header() failure
Stefano Sabatini [Fri, 29 Nov 2013 11:10:20 +0000 (12:10 +0100)]
ffserver: improve error feedback in case of write_header() failure

6 years agoffserver: improve feedback in case no feed is defined for a stream
Stefano Sabatini [Fri, 29 Nov 2013 10:47:01 +0000 (11:47 +0100)]
ffserver: improve feedback in case no feed is defined for a stream

6 years agoffserver: improve feedback in case of stream with unknown feed name
Stefano Sabatini [Fri, 29 Nov 2013 10:37:40 +0000 (11:37 +0100)]
ffserver: improve feedback in case of stream with unknown feed name

6 years agodoc/ffserver: specify missing argument for ACL feed option
Stefano Sabatini [Fri, 29 Nov 2013 09:22:10 +0000 (10:22 +0100)]
doc/ffserver: specify missing argument for ACL feed option

6 years agodoc/ffserver: fix RTSPOtion tpo
Stefano Sabatini [Fri, 29 Nov 2013 09:15:48 +0000 (10:15 +0100)]
doc/ffserver: fix RTSPOtion tpo

Spotted-by: ubitux
6 years agodoc/ffserver: extend documentation for Feed/File stream options
Stefano Sabatini [Fri, 29 Nov 2013 08:36:25 +0000 (09:36 +0100)]
doc/ffserver: extend documentation for Feed/File stream options

6 years agodoc/ffserver: uncomment line in stream section example
Stefano Sabatini [Fri, 29 Nov 2013 07:08:50 +0000 (08:08 +0100)]
doc/ffserver: uncomment line in stream section example

6 years agodoc/ffserver: reorder encoding options, and mark them as such
Stefano Sabatini [Fri, 29 Nov 2013 07:00:25 +0000 (08:00 +0100)]
doc/ffserver: reorder encoding options, and mark them as such

Also add notice about ffmpeg -override_ffserver option.

6 years agodoc/ffserver: extend documentation for various file-related options
Stefano Sabatini [Thu, 28 Nov 2013 20:06:08 +0000 (21:06 +0100)]
doc/ffserver: extend documentation for various file-related options

6 years agoffserver: deprecate inconsistent parsing behavior of Truncate option
Stefano Sabatini [Thu, 28 Nov 2013 21:47:39 +0000 (22:47 +0100)]
ffserver: deprecate inconsistent parsing behavior of Truncate option

Also make it accept the more consistent behavior (boolean option set to
true when specified).

6 years agoffserver: extend feedback in http_start_receive_data()
Stefano Sabatini [Thu, 28 Nov 2013 21:47:18 +0000 (22:47 +0100)]
ffserver: extend feedback in http_start_receive_data()

6 years agoavcodec/dcadec: set AV_CLASS_CATEGORY
Michael Niedermayer [Fri, 29 Nov 2013 03:56:37 +0000 (04:56 +0100)]
avcodec/dcadec: set  AV_CLASS_CATEGORY

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/dcadec: AVClass is const
Michael Niedermayer [Fri, 29 Nov 2013 03:56:18 +0000 (04:56 +0100)]
avcodec/dcadec: AVClass is const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 29 Nov 2013 03:39:52 +0000 (04:39 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dcadec: add disable_xch private option.

Conflicts:
libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '220494ad0b2e9e980ef703b46b69308236f29be5'
Michael Niedermayer [Fri, 29 Nov 2013 03:21:10 +0000 (04:21 +0100)]
Merge commit '220494ad0b2e9e980ef703b46b69308236f29be5'

* commit '220494ad0b2e9e980ef703b46b69308236f29be5':
  dcadec: treat all 2-channel modes as Stereo in dca_downmix.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'aaa44d0299338e3bc90128816c21dbfab06cdb48'
Michael Niedermayer [Fri, 29 Nov 2013 03:00:59 +0000 (04:00 +0100)]
Merge commit 'aaa44d0299338e3bc90128816c21dbfab06cdb48'

* commit 'aaa44d0299338e3bc90128816c21dbfab06cdb48':
  dca: support mixing LFE in dca_downmix.

Conflicts:
libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '149438cfe5d233c46bb18341b7c574fe643dd5f2'
Michael Niedermayer [Fri, 29 Nov 2013 02:48:11 +0000 (03:48 +0100)]
Merge commit '149438cfe5d233c46bb18341b7c574fe643dd5f2'

* commit '149438cfe5d233c46bb18341b7c574fe643dd5f2':
  dca: improve default stereo downmix coefficients.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/dcadec: print more details about errors
Michael Niedermayer [Fri, 29 Nov 2013 02:42:03 +0000 (03:42 +0100)]
avcodec/dcadec: print more details about errors

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '44b17d794aa508ae21f438ae80bfe8aaf4b426e1'
Michael Niedermayer [Fri, 29 Nov 2013 00:53:58 +0000 (01:53 +0100)]
Merge commit '44b17d794aa508ae21f438ae80bfe8aaf4b426e1'

* commit '44b17d794aa508ae21f438ae80bfe8aaf4b426e1':
  dca: extract core substream's embedded downmix coeffcient codes, if present.

Conflicts:
libavcodec/dcadata.h
libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '27245b4e1bbb7a863341db321b5bdc5792e427d9'
Michael Niedermayer [Fri, 29 Nov 2013 00:12:02 +0000 (01:12 +0100)]
Merge commit '27245b4e1bbb7a863341db321b5bdc5792e427d9'

* commit '27245b4e1bbb7a863341db321b5bdc5792e427d9':
  dca: remove embedded downmix coefficient extraction.

Conflicts:
libavcodec/dcadata.h
libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b6d5e6aa10a2f09351f287e876f7ed4504e1f75d'
Michael Niedermayer [Thu, 28 Nov 2013 23:32:14 +0000 (00:32 +0100)]
Merge commit 'b6d5e6aa10a2f09351f287e876f7ed4504e1f75d'

* commit 'b6d5e6aa10a2f09351f287e876f7ed4504e1f75d':
  dca: convert dca_default_coeffs to float.

Conflicts:
libavcodec/dcadata.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '25609b63d2e07d26d610f485a22082d32c96c0f5'
Michael Niedermayer [Thu, 28 Nov 2013 23:23:51 +0000 (00:23 +0100)]
Merge commit '25609b63d2e07d26d610f485a22082d32c96c0f5'

* commit '25609b63d2e07d26d610f485a22082d32c96c0f5':
  dcadec: store the stereo downmix coefficients as float in the DCAContext.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '89de5157b1cbe7807d3ec1d51bd56a75e98c002e'
Michael Niedermayer [Thu, 28 Nov 2013 22:15:35 +0000 (23:15 +0100)]
Merge commit '89de5157b1cbe7807d3ec1d51bd56a75e98c002e'

* commit '89de5157b1cbe7807d3ec1d51bd56a75e98c002e':
  dcadec: implement request_channel_layout.

Conflicts:
libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/ffserver: mention remaining stream options
Stefano Sabatini [Thu, 28 Nov 2013 22:53:10 +0000 (23:53 +0100)]
doc/ffserver: mention remaining stream options

6 years agodoc/ffserver: move general stream options upwards in the list
Stefano Sabatini [Thu, 28 Nov 2013 22:48:57 +0000 (23:48 +0100)]
doc/ffserver: move general stream options upwards in the list

6 years agodoc/ffserver: reorder/extend stream video encoding options
Stefano Sabatini [Thu, 28 Nov 2013 22:48:27 +0000 (23:48 +0100)]
doc/ffserver: reorder/extend stream video encoding options

6 years agodoc/ffserver: fix bitrate unit for bitrate option
Stefano Sabatini [Thu, 28 Nov 2013 22:39:02 +0000 (23:39 +0100)]
doc/ffserver: fix bitrate unit for bitrate option

6 years agoffserver: fix typo in comment: defaut -> default
Stefano Sabatini [Thu, 28 Nov 2013 21:45:54 +0000 (22:45 +0100)]
ffserver: fix typo in comment: defaut -> default

6 years agodoc/ffserver: add notice about re-launch behavior
Stefano Sabatini [Thu, 28 Nov 2013 21:45:21 +0000 (22:45 +0100)]
doc/ffserver: add notice about re-launch behavior

6 years agodoc/ffserver: document InputFormat stream option
Stefano Sabatini [Thu, 28 Nov 2013 20:06:28 +0000 (21:06 +0100)]
doc/ffserver: document InputFormat stream option

6 years agoffserver: factorize code setting ReadOnlyFile/File options
Stefano Sabatini [Thu, 28 Nov 2013 20:05:31 +0000 (21:05 +0100)]
ffserver: factorize code setting ReadOnlyFile/File options

6 years agoffserver: improve error feedback in open_input_stream()
Stefano Sabatini [Thu, 28 Nov 2013 20:04:50 +0000 (21:04 +0100)]
ffserver: improve error feedback in open_input_stream()

6 years agoffserver: drop stream AudioQuality option
Stefano Sabatini [Thu, 28 Nov 2013 18:36:31 +0000 (19:36 +0100)]
ffserver: drop stream AudioQuality option

It has no effect, and it was never documented.

6 years agoffserver: add comment about how Launch path program is created
Stefano Sabatini [Thu, 28 Nov 2013 17:30:03 +0000 (18:30 +0100)]
ffserver: add comment about how Launch path program is created

6 years agoffserver: extend error handling when parsing the configuration file
Stefano Sabatini [Thu, 28 Nov 2013 15:51:40 +0000 (16:51 +0100)]
ffserver: extend error handling when parsing the configuration file

In particular, abort immediately in case of memory error, avoid potential
crashes.

6 years agoffserver: add some error handling to main()
Stefano Sabatini [Thu, 28 Nov 2013 15:35:50 +0000 (16:35 +0100)]
ffserver: add some error handling to main()

6 years agoMerge commit 'cf7860db608df7c76471d8b61f07abbd5aad8dd5'
Michael Niedermayer [Thu, 28 Nov 2013 21:47:08 +0000 (22:47 +0100)]
Merge commit 'cf7860db608df7c76471d8b61f07abbd5aad8dd5'

* commit 'cf7860db608df7c76471d8b61f07abbd5aad8dd5':
  x86: dsputil: Suppress deprecation warnings for XvMC bits

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd1916d13e28b87f4b1b214231149e12e1d536b4b'
Michael Niedermayer [Thu, 28 Nov 2013 21:00:25 +0000 (22:00 +0100)]
Merge commit 'd1916d13e28b87f4b1b214231149e12e1d536b4b'

* commit 'd1916d13e28b87f4b1b214231149e12e1d536b4b':
  dsputil/pngdsp: fix signed/unsigned type in end comparison

Conflicts:
libavcodec/dsputil.c

See: 454a11a1c9c686c78aa97954306fb63453299760
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodcadec: add disable_xch private option.
Tim Walker [Sat, 23 Nov 2013 23:15:46 +0000 (00:15 +0100)]
dcadec: add disable_xch private option.

This supplements the deprecated request_channels-based control of XCh decoding.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agodcadec: treat all 2-channel modes as Stereo in dca_downmix.
Tim Walker [Fri, 22 Nov 2013 21:59:54 +0000 (22:59 +0100)]
dcadec: treat all 2-channel modes as Stereo in dca_downmix.

The check for (prim_channels > 2) before calling dca_downmix made these
cases unreachable, but now 2.1 layouts will go through the downmix code.
Having dual mono, Lt/Rt and sum-difference layouts print errors when
regular Stereo doesn't seems pointless.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agodca: support mixing LFE in dca_downmix.
Tim Walker [Fri, 22 Nov 2013 22:47:03 +0000 (23:47 +0100)]
dca: support mixing LFE in dca_downmix.

Embedded downmix coefficients can use this.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agodca: improve default stereo downmix coefficients.
Tim Walker [Fri, 22 Nov 2013 21:11:47 +0000 (22:11 +0100)]
dca: improve default stereo downmix coefficients.

Previous coefficients were producing a non-normalized, incorrect Lt/Rt downmix.

The new coefficients produce a standard Lo/Ro downmix with 3dB attenuation.

This should match the typical default coefficients used by DTS encoders.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agodca: extract core substream's embedded downmix coeffcient codes, if present.
Tim Walker [Fri, 22 Nov 2013 22:42:37 +0000 (23:42 +0100)]
dca: extract core substream's embedded downmix coeffcient codes, if present.

As per ETSI TS 102 114 V1.4.1 specification.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agodca: remove embedded downmix coefficient extraction.
Tim Walker [Fri, 22 Nov 2013 19:25:57 +0000 (20:25 +0100)]
dca: remove embedded downmix coefficient extraction.

It was based on an old, seemingly incorrect specification, so default
coefficients were always used anyway.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agolibrary.mak: only run asm strip if ASMSTRIP flags are set
Michael Niedermayer [Thu, 28 Nov 2013 20:52:46 +0000 (21:52 +0100)]
library.mak: only run asm strip if ASMSTRIP flags are set

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