ffmpeg.git
5 years agoMakefile: remove version.h on distclean
Michael Niedermayer [Sat, 30 Nov 2013 20:52:39 +0000 (21:52 +0100)]
Makefile: remove version.h on distclean

Without this nothing will remove it even if it isnt generated in newer
versions anymore.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agobuild: rename version.h to libavutil/ffversion.h
Timothy Gu [Fri, 29 Nov 2013 00:29:41 +0000 (16:29 -0800)]
build: rename version.h to libavutil/ffversion.h

Also the libavutil/ffversion.h will be installed.

Rationale:
* Applications might want to know FFmpeg's version besides the individual
  libraries'.
* Avoids file name clash between FFmpeg's ./version.h and lib*/version.h when
  a library source file includes both and is compiled on an out-of-tree build.

Fixes #1769.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoversion.sh: add preprocessing guards
Timothy Gu [Fri, 29 Nov 2013 17:57:30 +0000 (09:57 -0800)]
version.sh: add preprocessing guards

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoversion.sh: add a little usage comment
Timothy Gu [Fri, 29 Nov 2013 00:57:49 +0000 (16:57 -0800)]
version.sh: add a little usage comment

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 30 Nov 2013 20:08:47 +0000 (21:08 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dcadec: Add some logging before returning on error

Conflicts:
libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f058f384a0d76bfd125f4738dceab7c890186432'
Michael Niedermayer [Sat, 30 Nov 2013 19:37:34 +0000 (20:37 +0100)]
Merge commit 'f058f384a0d76bfd125f4738dceab7c890186432'

* commit 'f058f384a0d76bfd125f4738dceab7c890186432':
  configure: Do not use pthread_create to check for pthread

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpeg4video: fix doxycomments so they are not associated with random unrelated...
Michael Niedermayer [Sat, 30 Nov 2013 19:30:11 +0000 (20:30 +0100)]
avcodec/mpeg4video: fix doxycomments so they are not associated with random unrelated fields

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Sat, 30 Nov 2013 16:48:15 +0000 (17:48 +0100)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavc/srtenc: use bprint for text buffers.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoversion.sh: make it independant of version.h file name
Timothy Gu [Fri, 29 Nov 2013 01:00:28 +0000 (17:00 -0800)]
version.sh: make it independant of version.h file name

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/ffserver: clarify documentation for Feed MaxFileSize option
Stefano Sabatini [Sat, 30 Nov 2013 13:47:26 +0000 (14:47 +0100)]
doc/ffserver: clarify documentation for Feed MaxFileSize option

5 years agodoc/ffserver: clarify that note in NoDaemon option documentation
Stefano Sabatini [Sat, 30 Nov 2013 13:46:53 +0000 (14:46 +0100)]
doc/ffserver: clarify that note in NoDaemon option documentation

5 years agoffserver: print error code description in case of write_header() failure
Stefano Sabatini [Fri, 29 Nov 2013 16:24:09 +0000 (17:24 +0100)]
ffserver: print error code description in case of write_header() failure

Improve feedback.

5 years agodoc/ffserver: add "Detailed description" chapter
Stefano Sabatini [Fri, 29 Nov 2013 15:36:15 +0000 (16:36 +0100)]
doc/ffserver: add "Detailed description" chapter

Also move FFM section up in the file, and rename it.

5 years agodoc/ffserver: remove more mentions to LAME and build
Stefano Sabatini [Fri, 29 Nov 2013 14:43:19 +0000 (15:43 +0100)]
doc/ffserver: remove more mentions to LAME and build

5 years agolavc/srtenc: use bprint for text buffers.
Nicolas George [Mon, 25 Nov 2013 15:27:41 +0000 (16:27 +0100)]
lavc/srtenc: use bprint for text buffers.

Fix trac ticket #3120.

5 years agolavfi/Makefile: Don't compile lavfutils.c and lswsutils.c if they are not needed
James Almer [Fri, 29 Nov 2013 04:45:05 +0000 (01:45 -0300)]
lavfi/Makefile: Don't compile lavfutils.c and lswsutils.c if they are not needed

They are only needed by removelogo.
This fixes a link failure in shared builds when compiling with
removelogo disabled but Lavf/SwS enabled

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodcadec: Add some logging before returning on error
Tim Walker [Fri, 29 Nov 2013 17:12:26 +0000 (18:12 +0100)]
dcadec: Add some logging before returning on error

Based on a patch by Michael Niedermayer.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoconfigure: Do not use pthread_create to check for pthread
Luca Barbato [Fri, 29 Nov 2013 17:29:12 +0000 (09:29 -0800)]
configure: Do not use pthread_create to check for pthread

Certain instrumentation addons leads to a false positive in configure
and link failures at the end of the build phase.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sat, 30 Nov 2013 04:07:15 +0000 (05:07 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffmpeg: ensure that -fix_sub_duration doesnt create subtitles with zero duration
  ffmpeg: free empty subtitles as well in transcode_subtitles
  ffmpeg: do not pass possibly undefined subtitles to sub2video_update

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 30 Nov 2013 03:48:23 +0000 (04:48 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  go2meeting: disallow tile dimensions that are not multiple of 16

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

* commit 'e026ee0446de27fc38e33e98704fada012fdc763':
  mpeg4videodec: move sprite_{shift,traj} from MpegEncContext to Mpeg4DecContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '513d849bb605d3d862da1ada709bd2ca1ac68f58'
Michael Niedermayer [Sat, 30 Nov 2013 03:34:43 +0000 (04:34 +0100)]
Merge commit '513d849bb605d3d862da1ada709bd2ca1ac68f58'

* commit '513d849bb605d3d862da1ada709bd2ca1ac68f58':
  mpeg4videodec: move num_sprite_warping_points from MpegEncContext to Mpeg4DecContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091'
Michael Niedermayer [Sat, 30 Nov 2013 03:29:22 +0000 (04:29 +0100)]
Merge commit '9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091'

* commit '9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091':
  mpeg4videodec: move sprite_brightness_change from MpegEncContext to Mpeg4DecContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 years agogo2meeting: disallow tile dimensions that are not multiple of 16
Kostya Shishkov [Fri, 29 Nov 2013 08:15:00 +0000 (09:15 +0100)]
go2meeting: disallow tile dimensions that are not multiple of 16

Original decoder seems to always use 176x128 tiles anyway and this helps
avoiding lots of issues with odd tile sizes in fuzzed files.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agompeg4videodec: move sprite_{shift,traj} from MpegEncContext to Mpeg4DecContext
Anton Khirnov [Tue, 26 Nov 2013 13:34:52 +0000 (14:34 +0100)]
mpeg4videodec: move sprite_{shift,traj} from MpegEncContext to Mpeg4DecContext

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

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

5 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

5 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

5 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

5 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

5 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

5 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>
5 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

5 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

5 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

5 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

5 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

5 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

5 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.

5 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.

5 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.

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

5 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

5 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

5 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

5 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.

5 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.

5 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

5 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.

5 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

5 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>
5 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

5 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

5 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

5 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

5 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
5 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

5 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

5 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.

5 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

5 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).

5 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()

5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>