ffmpeg.git
8 years agovf_mp: remove boxblur wrapper
Stefano Sabatini [Sat, 9 Jul 2011 16:23:02 +0000 (18:23 +0200)]
vf_mp: remove boxblur wrapper

It is natively included in libavfilter.

8 years agocmdutils: remove #if 0-ed conflict marger trash that i forgot
Michael Niedermayer [Thu, 14 Jul 2011 19:27:13 +0000 (21:27 +0200)]
cmdutils: remove #if 0-ed conflict marger trash that i forgot

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: loose lowres hackery
Michael Niedermayer [Thu, 14 Jul 2011 19:22:12 +0000 (21:22 +0200)]
ffmpeg: loose lowres hackery

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 14 Jul 2011 18:44:58 +0000 (20:44 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  APIchanges: fill in missing hashes and dates.
  Add an APIChanges entry and bump minor versions for recent changes.
  ffmpeg: print the low bitrate warning after the codec is openend.
  doxygen: Move function documentation into the macro generating the function.
  doxygen: Make sure parameter names match between .c and .h files.
  h264: move fill_decode_neighbors()/fill_decode_caches() to h264_mvpred.h
  H.264: Add more x86 assembly for 10-bit H.264 predict functions
  lavf: fix invalid reads in avformat_find_stream_info()
  cmdutils: replace opt_default with opt_default2() and remove set_context_opts
  ffmpeg: use new avcodec_open2 and avformat_find_stream_info API.
  ffplay: use new avcodec_open2 and avformat_find_stream_info API.
  cmdutils: store all codec options in one dict instead of video/audio/sub
  ffmpeg: check experimental flag after codec is opened.
  ffmpeg: do not set GLOBAL_HEADER flag in the options context

Conflicts:
cmdutils.c
doc/APIchanges
ffmpeg.c
ffplay.c
libavcodec/version.h
libavformat/version.h
libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: deprecate -vc and -tvstd
Anton Khirnov [Wed, 15 Jun 2011 05:34:12 +0000 (07:34 +0200)]
ffmpeg: deprecate -vc and -tvstd

They've been replaced by demuxer private options.

55ba12e3009fd6c8f78102f7c747496d500d0bac

8 years agoffmpeg: use new avformat_open_* API.
Anton Khirnov [Thu, 9 Jun 2011 08:58:23 +0000 (10:58 +0200)]
ffmpeg: use new avformat_open_* API.

8035f429684e368fe54af8ccedc2d4776a2d6154

8 years agoseektest: forgot adding a file (from commit 191c5f8ff33eb995b6dbc5b11af7c1a79f8381f0...
Michael Niedermayer [Thu, 14 Jul 2011 15:49:29 +0000 (17:49 +0200)]
seektest: forgot adding a file (from commit 191c5f8ff33eb995b6dbc5b11af7c1a79f8381f0 during the last merge)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoAPIchanges: fill in missing hashes and dates.
Anton Khirnov [Thu, 14 Jul 2011 08:43:24 +0000 (10:43 +0200)]
APIchanges: fill in missing hashes and dates.

8 years agoAdd an APIChanges entry and bump minor versions for recent changes.
Anton Khirnov [Thu, 14 Jul 2011 08:09:05 +0000 (10:09 +0200)]
Add an APIChanges entry and bump minor versions for recent changes.

8 years agoffmpeg: print the low bitrate warning after the codec is openend.
Anton Khirnov [Thu, 14 Jul 2011 07:38:36 +0000 (09:38 +0200)]
ffmpeg: print the low bitrate warning after the codec is openend.

This doesn't access avcodec_opts, so it works with the new options
passing system.

Makes opt_bitrate() unneeded, so it's removed.

8 years agodoxygen: Move function documentation into the macro generating the function.
Diego Biurrun [Mon, 4 Jul 2011 10:33:11 +0000 (12:33 +0200)]
doxygen: Move function documentation into the macro generating the function.

This fixes a bunch of related warnings where Doxygen assumed that the
documentation belonged to the macro and not the function.

8 years agodoxygen: Make sure parameter names match between .c and .h files.
Diego Biurrun [Sat, 2 Jul 2011 12:47:34 +0000 (14:47 +0200)]
doxygen: Make sure parameter names match between .c and .h files.

8 years agoh264: move fill_decode_neighbors()/fill_decode_caches() to h264_mvpred.h
Diego Biurrun [Wed, 13 Jul 2011 19:51:23 +0000 (21:51 +0200)]
h264: move fill_decode_neighbors()/fill_decode_caches() to h264_mvpred.h

This fixes a bunch of unused function warnings.

8 years agoH.264: Add more x86 assembly for 10-bit H.264 predict functions
Daniel Kang [Mon, 11 Jul 2011 21:26:43 +0000 (17:26 -0400)]
H.264: Add more x86 assembly for 10-bit H.264 predict functions

Mainly ported from 8-bit H.264 predict.

Some code ported from x264. LGPL ok by author.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agolavf: fix invalid reads in avformat_find_stream_info()
Anton Khirnov [Thu, 14 Jul 2011 01:08:53 +0000 (03:08 +0200)]
lavf: fix invalid reads in avformat_find_stream_info()

8 years agoMerge commit 'b5849f77095439e994b11c25e6063d443b36c228'
Michael Niedermayer [Thu, 14 Jul 2011 00:22:48 +0000 (02:22 +0200)]
Merge commit 'b5849f77095439e994b11c25e6063d443b36c228'

* commit 'b5849f77095439e994b11c25e6063d443b36c228': (21 commits)
  ac3enc: merge AC3MDCTContext with AC3EncodeContext.
  ac3enc: prefer passing AC3EncodeContext rather than AVCodecContext
  ac3enc: fix memleak
  mpeg1video: add CODEC_CAP_SLICE_THREADS.
  lavf: fix segfault in av_open_input_stream()
  mpegtsenc: set Random Access indicator on keyframe start packets
  lavf: Cleanup try_decode_frame() logic.
  Replace some gotos that lead to single return statements by direct return.
  build: move tests/seek_test.c to libavformat and reuse generic build rules
  mxfenc: include needed header for ff_iso8601_to_unix_time() prototype
  Add a check for strptime().
  lavf: factor out conversion of ISO8601 string to unix time
  wav: parse 'bext' metadata
  wav: keep parsing until EOF if the input is seekable and we know the size of the data tag
  wav: Refactor the tag checking into a switch statement
  wav: make sure neither data_size nor sample_count is negative.
  wav: refactor the 'fmt ' tag search and parsing.
  wav: add an option for writing BEXT chunk
  ffmpeg: get rid of a pointless limit on number of streams.
  ffmpeg: remove an unused define.
  ...

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavfi: port boxblur filter from libmpcodecs
Stefano Sabatini [Sat, 9 Jul 2011 16:13:10 +0000 (18:13 +0200)]
lavfi: port boxblur filter from libmpcodecs

With the following additions:
* support to gray format
* support to yuva420p format
* parametric luma/chroma/alpha radius
* consistency check on the radius values, avoid crashes with invalid values

8 years agocmdutils: replace opt_default with opt_default2() and remove set_context_opts
Anton Khirnov [Wed, 25 May 2011 15:30:23 +0000 (17:30 +0200)]
cmdutils: replace opt_default with opt_default2() and remove set_context_opts

8 years agoffmpeg: use new avcodec_open2 and avformat_find_stream_info API.
Anton Khirnov [Wed, 25 May 2011 15:29:25 +0000 (17:29 +0200)]
ffmpeg: use new avcodec_open2 and avformat_find_stream_info API.

8 years agoffplay: use new avcodec_open2 and avformat_find_stream_info API.
Anton Khirnov [Wed, 25 May 2011 14:59:51 +0000 (16:59 +0200)]
ffplay: use new avcodec_open2 and avformat_find_stream_info API.

8 years agocmdutils: store all codec options in one dict instead of video/audio/sub
Anton Khirnov [Sun, 10 Jul 2011 13:46:15 +0000 (15:46 +0200)]
cmdutils: store all codec options in one dict instead of video/audio/sub

Split them when codec id is known.

8 years agoffmpeg: check experimental flag after codec is opened.
Anton Khirnov [Tue, 12 Jul 2011 15:18:42 +0000 (17:18 +0200)]
ffmpeg: check experimental flag after codec is opened.

This doesn't access avcodec_opts, so it will work with the new options
passing system.

8 years agoffmpeg: do not set GLOBAL_HEADER flag in the options context
Anton Khirnov [Tue, 12 Jul 2011 14:18:45 +0000 (16:18 +0200)]
ffmpeg: do not set GLOBAL_HEADER flag in the options context

The removed lines have no effect, since the flag is set on all encoder
for the given file and avcodec_opts are reset between files.

8 years agoac3enc: merge AC3MDCTContext with AC3EncodeContext.
Justin Ruggles [Wed, 13 Jul 2011 19:12:11 +0000 (15:12 -0400)]
ac3enc: merge AC3MDCTContext with AC3EncodeContext.

Since both the fixed-point and floating-point encoders use the FFTContext,
this no longer needs to be in a separate context. Also, when a short-transform
context is added, the same MDCT window will be used.

8 years agoac3enc: prefer passing AC3EncodeContext rather than AVCodecContext
Justin Ruggles [Wed, 13 Jul 2011 17:53:58 +0000 (13:53 -0400)]
ac3enc: prefer passing AC3EncodeContext rather than AVCodecContext

8 years agoac3enc: fix memleak
Justin Ruggles [Wed, 13 Jul 2011 19:49:08 +0000 (15:49 -0400)]
ac3enc: fix memleak

8 years agompeg1video: add CODEC_CAP_SLICE_THREADS.
Ronald S. Bultje [Wed, 29 Jun 2011 21:13:17 +0000 (14:13 -0700)]
mpeg1video: add CODEC_CAP_SLICE_THREADS.

8 years agolavf: fix segfault in av_open_input_stream()
Anton Khirnov [Tue, 12 Jul 2011 20:42:18 +0000 (22:42 +0200)]
lavf: fix segfault in av_open_input_stream()

ic is NULL in case of error.

8 years agompegtsenc: set Random Access indicator on keyframe start packets
Jindrich Makovicka [Wed, 29 Jun 2011 13:01:39 +0000 (15:01 +0200)]
mpegtsenc: set Random Access indicator on keyframe start packets

Signed-off-by: Jindrich Makovicka <jindrich.makovicka@nangu.tv>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agolavf: Cleanup try_decode_frame() logic.
Alex Converse [Tue, 12 Jul 2011 22:13:29 +0000 (15:13 -0700)]
lavf: Cleanup try_decode_frame() logic.

This fixes AAC playback in ffplay.

8 years agoReplace some gotos that lead to single return statements by direct return.
Diego Biurrun [Mon, 11 Jul 2011 14:32:54 +0000 (16:32 +0200)]
Replace some gotos that lead to single return statements by direct return.

8 years agobuild: move tests/seek_test.c to libavformat and reuse generic build rules
Diego Biurrun [Wed, 13 Jul 2011 00:09:19 +0000 (02:09 +0200)]
build: move tests/seek_test.c to libavformat and reuse generic build rules

8 years agomxfenc: include needed header for ff_iso8601_to_unix_time() prototype
Kostya Shishkov [Wed, 13 Jul 2011 11:21:00 +0000 (12:21 +0100)]
mxfenc: include needed header for ff_iso8601_to_unix_time() prototype

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoAdd a check for strptime().
Anton Khirnov [Wed, 13 Jul 2011 07:30:06 +0000 (09:30 +0200)]
Add a check for strptime().

It's an XSI extension, not available on some supported systems.

8 years agolavf: factor out conversion of ISO8601 string to unix time
Anton Khirnov [Wed, 13 Jul 2011 09:45:17 +0000 (11:45 +0200)]
lavf: factor out conversion of ISO8601 string to unix time

8 years agowav: parse 'bext' metadata
Tomas Härdin [Wed, 18 May 2011 11:48:39 +0000 (13:48 +0200)]
wav: parse 'bext' metadata

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agowav: keep parsing until EOF if the input is seekable and we know the size of the...
Tomas Härdin [Wed, 18 May 2011 11:48:02 +0000 (13:48 +0200)]
wav: keep parsing until EOF if the input is seekable and we know the size of the data tag

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agowav: Refactor the tag checking into a switch statement
Tomas Härdin [Thu, 17 Feb 2011 14:58:10 +0000 (15:58 +0100)]
wav: Refactor the tag checking into a switch statement

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agowav: make sure neither data_size nor sample_count is negative.
Tomas Härdin [Tue, 17 May 2011 17:52:36 +0000 (19:52 +0200)]
wav: make sure neither data_size nor sample_count is negative.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agowav: refactor the 'fmt ' tag search and parsing.
Tomas Härdin [Tue, 17 May 2011 17:46:08 +0000 (19:46 +0200)]
wav: refactor the 'fmt ' tag search and parsing.

Moving the search and parsing of the 'fmt ' info the main loop of
wav_read_header() allows tags that precede it to be parsed.  Creating
wav_parse_fmt_tag() makes wav_read_header() easier to read.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agowav: add an option for writing BEXT chunk
Benjamin Larsson [Fri, 18 Mar 2011 00:00:15 +0000 (00:00 +0000)]
wav: add an option for writing BEXT chunk

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoffmpeg: get rid of a pointless limit on number of streams.
Anton Khirnov [Sat, 9 Jul 2011 14:49:44 +0000 (16:49 +0200)]
ffmpeg: get rid of a pointless limit on number of streams.

8 years agoffmpeg: remove an unused define.
Anton Khirnov [Sat, 9 Jul 2011 14:48:47 +0000 (16:48 +0200)]
ffmpeg: remove an unused define.

8 years agoMusepack SV7: try to read files without number of frames provided
Kostya Shishkov [Mon, 11 Jul 2011 13:13:39 +0000 (15:13 +0200)]
Musepack SV7: try to read files without number of frames provided

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 12 Jul 2011 22:42:11 +0000 (00:42 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc: Improve references to external URLs.
  h264: move decode_mb_skip() from h264.h to h.264_mvpred.h
  ffplay: skip return value of avcodec_decode_video2 / avcodec_decode_subtitle2
  dnxhdenc: Replace a forward declaration by the proper #include.
  h264: move h264_mvpred.h include.
  pix_fmt: Fix number of bits per component in yuv444p9be
  lavf: deprecate AVFormatContext.timestamp
  ffmpeg: merge input_files_ts_scale into InputStream.
  ffmpeg: don't abuse a global for passing sample format from input to output
  ffmpeg: don't abuse a global for passing channel layout from input to output
  ffmpeg: factor common code from new_a/v/s/d_stream to new_output_stream()
  matroskaenc: make SSA default subtitle codec.
  oggdec: prevent heap corruption.

Conflicts:
doc/developer.texi
doc/faq.texi
doc/general.texi
ffmpeg.c
ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodoc: Improve references to external URLs.
Diego Biurrun [Fri, 8 Jul 2011 13:33:17 +0000 (15:33 +0200)]
doc: Improve references to external URLs.

Sometimes it makes sense to replace a raw URL with some informative text
that links to the URL instead of using the raw URL itself in the text.
Also transform some mailing list references into links.

8 years agoh264: move decode_mb_skip() from h264.h to h.264_mvpred.h
Diego Biurrun [Tue, 12 Jul 2011 18:36:50 +0000 (20:36 +0200)]
h264: move decode_mb_skip() from h264.h to h.264_mvpred.h

This resolves a circular dependency between the headers.

8 years agoffplay: skip return value of avcodec_decode_video2 / avcodec_decode_subtitle2
Diego Biurrun [Mon, 11 Jul 2011 15:04:15 +0000 (17:04 +0200)]
ffplay: skip return value of avcodec_decode_video2 / avcodec_decode_subtitle2

This fixes some warnings about unused-but-set variables.

8 years agoMove resetting of channels, sample_rate back to av_find_stream_info.
Reimar Döffinger [Mon, 11 Jul 2011 18:35:02 +0000 (20:35 +0200)]
Move resetting of channels, sample_rate back to av_find_stream_info.

Resetting it on codec init would incorrectly clear the values
if av_find_stream_info was already run before, in particular
breaking ffplay.

This fixes trac tickets #213 and #262.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agodnxhdenc: Replace a forward declaration by the proper #include.
Diego Biurrun [Fri, 8 Jul 2011 13:29:57 +0000 (15:29 +0200)]
dnxhdenc: Replace a forward declaration by the proper #include.

8 years agoSupport adpcm_ima_wav and adpcm_ms in caf.
Carl Eugen Hoyos [Tue, 12 Jul 2011 15:35:20 +0000 (17:35 +0200)]
Support adpcm_ima_wav and adpcm_ms in caf.

8 years agoh264: move h264_mvpred.h include.
Ronald S. Bultje [Tue, 12 Jul 2011 15:15:55 +0000 (08:15 -0700)]
h264: move h264_mvpred.h include.

Fixes the following compile error with darwin/gcc-4.2.1:
In file included from libavcodec/error_resilience.c:33:
libavcodec/h264.h: In function â€˜decode_mb_skip’:
libavcodec/h264.h:773: error: â€˜always_inline’ function could not be inlined in call to â€˜pred_pskip_motion’: the function body must appear before caller
libavcodec/h264.h:1334: error: called from here

8 years agopix_fmt: Fix number of bits per component in yuv444p9be
Oskar Arvidsson [Tue, 12 Jul 2011 08:52:19 +0000 (10:52 +0200)]
pix_fmt: Fix number of bits per component in yuv444p9be

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoAdd another MP3 CAF codec tag.
Carl Eugen Hoyos [Tue, 12 Jul 2011 14:09:10 +0000 (16:09 +0200)]
Add another MP3 CAF codec tag.

8 years agolavf: deprecate AVFormatContext.timestamp
Anton Khirnov [Thu, 7 Jul 2011 09:25:03 +0000 (11:25 +0200)]
lavf: deprecate AVFormatContext.timestamp

It's replaced by 'creation_time' metadata tag.

8 years agoffmpeg: merge input_files_ts_scale into InputStream.
Anton Khirnov [Thu, 7 Jul 2011 06:54:07 +0000 (08:54 +0200)]
ffmpeg: merge input_files_ts_scale into InputStream.

8 years agoffmpeg: don't abuse a global for passing sample format from input to output
Anton Khirnov [Wed, 15 Jun 2011 06:00:03 +0000 (08:00 +0200)]
ffmpeg: don't abuse a global for passing sample format from input to output

It's broken with multiple files or audio streams.

8 years agoffmpeg: don't abuse a global for passing channel layout from input to output
Anton Khirnov [Wed, 15 Jun 2011 06:00:03 +0000 (08:00 +0200)]
ffmpeg: don't abuse a global for passing channel layout from input to output

It's broken with multiple files or audio streams.

8 years agoffmpeg: factor common code from new_a/v/s/d_stream to new_output_stream()
Anton Khirnov [Sat, 25 Jun 2011 05:43:49 +0000 (07:43 +0200)]
ffmpeg: factor common code from new_a/v/s/d_stream to new_output_stream()

8 years agomatroskaenc: make SSA default subtitle codec.
Anton Khirnov [Fri, 24 Jun 2011 19:34:42 +0000 (21:34 +0200)]
matroskaenc: make SSA default subtitle codec.

It's a better format and we have an encoder for it, so it doesn't fail
like CODEC_ID_TEXT.

8 years agoRELEASE: We are git after 0.8 release
Dominique Leuenberger [Mon, 11 Jul 2011 18:33:45 +0000 (20:33 +0200)]
RELEASE: We are git after 0.8 release

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 11 Jul 2011 23:42:32 +0000 (01:42 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  changelog: misc typo and wording fixes
  H.264: add filter_mb_fast support for >8-bit decoding
  doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support.
  lls: use av_lfg instead of rand() in test program
  build: remove unnecessary dependency on libs from 'all' target
  H.264: avoid redundant alpha/beta calculations in loopfilter
  H.264: optimize intra/inter loopfilter decision
  mpegts: fix Continuity Counter error detection
  build: remove unnecessary FFLDFLAGS variable
  vp8/mt: flush worker thread, not application thread context, on seek.
  mt: proper locking around release_buffer calls.
  DxVA2: unbreak build after [657ccb5ac75ce34e62bd67f228d9bd36db72189e]
  hwaccel: unbreak build
  Eliminate FF_COMMON_FRAME macro.

Conflicts:
Changelog
Makefile
doc/developer.texi
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agooggdec: prevent heap corruption.
Chris Evans [Wed, 29 Jun 2011 22:44:40 +0000 (15:44 -0700)]
oggdec: prevent heap corruption.

Specifically crafted samples can reinit ogg->streams[] while
reading samples, and thus we should not cache old pointers since
these may no longer be valid.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agochangelog: misc typo and wording fixes
Diego Biurrun [Sat, 9 Jul 2011 15:43:53 +0000 (17:43 +0200)]
changelog: misc typo and wording fixes

8 years agoH.264: add filter_mb_fast support for >8-bit decoding
Jason Garrett-Glaser [Mon, 11 Jul 2011 21:46:37 +0000 (14:46 -0700)]
H.264: add filter_mb_fast support for >8-bit decoding

Much faster high bit depth deblocking.

8 years agodoc: Remove outdated comments about gcc 2.95 and gcc 3.3 support.
Diego Biurrun [Sat, 9 Jul 2011 18:15:29 +0000 (20:15 +0200)]
doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support.

8 years agolls: use av_lfg instead of rand() in test program
Mans Rullgard [Fri, 8 Jul 2011 14:01:05 +0000 (15:01 +0100)]
lls: use av_lfg instead of rand() in test program

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agobuild: remove unnecessary dependency on libs from 'all' target
Mans Rullgard [Mon, 11 Jul 2011 19:53:15 +0000 (20:53 +0100)]
build: remove unnecessary dependency on libs from 'all' target

The libs are added to the all target elsewhere, no need to do it
again here.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoH.264: avoid redundant alpha/beta calculations in loopfilter
Jason Garrett-Glaser [Sun, 10 Jul 2011 09:25:53 +0000 (02:25 -0700)]
H.264: avoid redundant alpha/beta calculations in loopfilter

8 years agoH.264: optimize intra/inter loopfilter decision
Jason Garrett-Glaser [Sun, 10 Jul 2011 08:28:50 +0000 (01:28 -0700)]
H.264: optimize intra/inter loopfilter decision

8 years agompegts: fix Continuity Counter error detection
Jindrich Makovicka [Thu, 30 Jun 2011 09:03:15 +0000 (09:03 +0000)]
mpegts: fix Continuity Counter error detection

According to MPEG-TS specs, the continuity_counter shall not be
incremented when the adaptation_field_control of the packet
equals '00' or '10'.

Signed-off-by: Jindrich Makovicka <jindrich.makovicka@nangu.tv>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agobuild: remove unnecessary FFLDFLAGS variable
Mans Rullgard [Sun, 10 Jul 2011 21:01:41 +0000 (22:01 +0100)]
build: remove unnecessary FFLDFLAGS variable

This variable is set to the same value for all directories.
Adding the -L flags directly to LDFLAGS is simpler and achieves
the same thing.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agovp8/mt: flush worker thread, not application thread context, on seek.
Ronald S. Bultje [Mon, 11 Jul 2011 04:23:09 +0000 (21:23 -0700)]
vp8/mt: flush worker thread, not application thread context, on seek.

This prevents a crash when seeking.

8 years agomt: proper locking around release_buffer calls.
Ronald S. Bultje [Mon, 11 Jul 2011 00:28:28 +0000 (17:28 -0700)]
mt: proper locking around release_buffer calls.

This fixes a crash when seeking in some webm files with many
threads (e.g. 8).

8 years agoRevert "lavc: remove a half-working attempt at different defaults for audio/video...
Michael Niedermayer [Mon, 11 Jul 2011 03:46:51 +0000 (05:46 +0200)]
Revert "lavc: remove a half-working attempt at different defaults for audio/video codecs."

This reverts commit 18c007ba37b2c7dee5bd2f1a3eb3bfee9b6b3d26.

8 years agoMerge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf'
Michael Niedermayer [Mon, 11 Jul 2011 02:23:25 +0000 (04:23 +0200)]
Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf'

* commit '142e76f1055de5dde44696e71a5f63f2cb11dedf':
  swscale: fix crash with dithering due incorrect offset calculation.
  matroskadec: fix stupid typo (!= -> ==)
  build: remove duplicates from order-only directory prerequisite list
  build: rework rules for things in the tools dir
  configure: fix --cpu=host with gcc 4.6
  ARM: use const macro to define constant data in asm
  bitdepth: simplify FUNC/FUNCC macros
  dsputil: remove ff_emulated_edge_mc macro used in one place
  9/10-bit: simplify clipping macros
  matroskadec: reindent
  matroskadec: defer parsing of cues element until we seek.
  lavc: add support for codec-specific defaults.
  lavc: make avcodec_alloc_context3 officially public.
  lavc: remove a half-working attempt at different defaults for audio/video codecs.
  ac3dec: add a drc_scale private option
  lavf: add avformat_find_stream_info()
  lavc: introduce avcodec_open2() as a replacement for avcodec_open().

Conflicts:
Makefile
libavcodec/utils.c
libavformat/avformat.h
libswscale/swscale_internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge branch 'sws_32bit_integration'
Michael Niedermayer [Mon, 11 Jul 2011 02:00:41 +0000 (04:00 +0200)]
Merge branch 'sws_32bit_integration'

* sws_32bit_integration:
  regtests/sws: update checksums for recent changes
  sws: dont mess with XInc when the code needing it isnt used
  sws: Fix chroma init for 32bit buffers.
  swscale: error dithering for 16/9/10-bit to 8-bit.
  swscale: fix overflow in 16-bit vertical scaling.
  swscale: fix crash in 8-bpc bilinear output without alpha.
  swscale: fix 16-bit scaling when output is 8-bits.
  sws: fix non native endian 9-15 bit input with 16bit out
  sws: disable scale16 when int32 is used
  sws: fix rgb -> 16bit
  sws: fix uv overwrite in 32bt
  sws: fix gray16_1
  sws:ix yuv2rgb48_1_c_template()
  sws: fix 16/32 bug from merge
  swscale: for >8bit scaling, read in native bit-depth.
  swscale: fix another yuv range conversion overflow in 16bit scaling. (cherry picked from commit 81cc7d0bd1eab0aa782ff8dd49e087025a42cdee)
  swscale: fix yuv range correction when using 16-bit scaling. (cherry picked from commit e0b8fff6c7a293e35079ba1931bd19372686b3f6)
  swscale: implement >8bit scaling support.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoregtests/sws: update checksums for recent changes
Michael Niedermayer [Mon, 11 Jul 2011 01:54:30 +0000 (03:54 +0200)]
regtests/sws: update checksums for recent changes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosws: dont mess with XInc when the code needing it isnt used
Michael Niedermayer [Sun, 10 Jul 2011 23:44:23 +0000 (01:44 +0200)]
sws: dont mess with XInc when the code needing it isnt used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosws: Fix chroma init for 32bit buffers.
Michael Niedermayer [Sun, 10 Jul 2011 13:58:24 +0000 (15:58 +0200)]
sws: Fix chroma init for 32bit buffers.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswscale: error dithering for 16/9/10-bit to 8-bit.
Ronald S. Bultje [Tue, 5 Jul 2011 19:49:11 +0000 (12:49 -0700)]
swscale: error dithering for 16/9/10-bit to 8-bit.

Based on a somewhat similar idea in FFmpeg's swscale copy.

8 years agoswscale: fix overflow in 16-bit vertical scaling.
Ronald S. Bultje [Fri, 8 Jul 2011 21:57:07 +0000 (14:57 -0700)]
swscale: fix overflow in 16-bit vertical scaling.

We operated on 31-bits, but with e.g. lanczos scaling, values can
add up to beyond 0x80000000, thus leading to output of zeroes. Drop
one bit of precision fixes this.

8 years agoswscale: fix crash in 8-bpc bilinear output without alpha.
Ronald S. Bultje [Fri, 8 Jul 2011 19:28:28 +0000 (12:28 -0700)]
swscale: fix crash in 8-bpc bilinear output without alpha.

We accessed the alpha array even it wasn't used and didn't
exist, hence leading to a NULL pointer segfault.
(cherry picked from commit bf2cba453244a74331238a472fe0e309f116f4d9)

8 years agoswscale: fix 16-bit scaling when output is 8-bits.
Ronald S. Bultje [Fri, 8 Jul 2011 21:52:52 +0000 (14:52 -0700)]
swscale: fix 16-bit scaling when output is 8-bits.

We would use the second half of the U plane buffer, rather than the
V plane buffer, to output the V plane pixels.

8 years agosws: fix non native endian 9-15 bit input with 16bit out
Michael Niedermayer [Sun, 3 Jul 2011 00:46:54 +0000 (02:46 +0200)]
sws: fix non native endian 9-15 bit input with 16bit out

8 years agosws: disable scale16 when int32 is used
Michael Niedermayer [Sun, 3 Jul 2011 00:34:00 +0000 (02:34 +0200)]
sws: disable scale16 when int32 is used

8 years agosws: fix rgb -> 16bit
Michael Niedermayer [Sun, 3 Jul 2011 00:08:45 +0000 (02:08 +0200)]
sws: fix rgb -> 16bit

8 years agosws: fix uv overwrite in 32bt
Michael Niedermayer [Sat, 2 Jul 2011 23:04:51 +0000 (01:04 +0200)]
sws: fix uv overwrite in 32bt

8 years agosws: fix gray16_1
Michael Niedermayer [Sat, 2 Jul 2011 22:33:23 +0000 (00:33 +0200)]
sws: fix gray16_1

8 years agosws:ix yuv2rgb48_1_c_template()
Michael Niedermayer [Sat, 2 Jul 2011 21:30:14 +0000 (23:30 +0200)]
sws:ix yuv2rgb48_1_c_template()

8 years agosws: fix 16/32 bug from merge
Michael Niedermayer [Sat, 2 Jul 2011 00:25:02 +0000 (02:25 +0200)]
sws: fix 16/32 bug from merge

8 years agoswscale: for >8bit scaling, read in native bit-depth.
Ronald S. Bultje [Fri, 1 Jul 2011 00:35:13 +0000 (17:35 -0700)]
swscale: for >8bit scaling, read in native bit-depth.

For 9/10bit, it means we don't have to upscale to 16bit before
actual scaling or pixel format conversion, and thus a performance
gain.

8 years agoMerge branch 'ronalds_buggy_gt8bit_sws'
Michael Niedermayer [Fri, 1 Jul 2011 03:28:13 +0000 (05:28 +0200)]
Merge branch 'ronalds_buggy_gt8bit_sws'

* ronalds_buggy_gt8bit_sws:
  swscale: fix another yuv range conversion overflow in 16bit scaling. (cherry picked from commit 81cc7d0bd1eab0aa782ff8dd49e087025a42cdee)
  swscale: fix yuv range correction when using 16-bit scaling. (cherry picked from commit e0b8fff6c7a293e35079ba1931bd19372686b3f6)
  swscale: implement >8bit scaling support.

Conflicts:
libswscale/swscale.c
libswscale/utils.c
libswscale/x86/swscale_template.c
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoDxVA2: unbreak build after [657ccb5ac75ce34e62bd67f228d9bd36db72189e]
Jean-Baptiste Kempf [Sun, 10 Jul 2011 23:13:20 +0000 (01:13 +0200)]
DxVA2: unbreak build after [657ccb5ac75ce34e62bd67f228d9bd36db72189e]

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agohwaccel: unbreak build
Mans Rullgard [Sun, 10 Jul 2011 22:55:06 +0000 (23:55 +0100)]
hwaccel: unbreak build

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoEliminate FF_COMMON_FRAME macro.
Diego Biurrun [Wed, 6 Jul 2011 18:08:30 +0000 (20:08 +0200)]
Eliminate FF_COMMON_FRAME macro.

FF_COMMON_FRAME holds the contents of the AVFrame structure and is also copied
to struct Picture.  Replace by an embedded AVFrame structure in struct Picture.

8 years agoswscale: fix crash with dithering due incorrect offset calculation.
Anton Mitrofanov [Sun, 10 Jul 2011 16:07:43 +0000 (20:07 +0400)]
swscale: fix crash with dithering due incorrect offset calculation.

ptrdiff_t can be 4 bytes, which leads to the next element being 4-byte
aligned and thus at a different offset than intended. Forcing 8-byte
alignment forces equal offset of dither16/32 on x86-32 and x86-64.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agomatroskadec: fix stupid typo (!= -> ==)
Anton Khirnov [Sun, 10 Jul 2011 19:48:23 +0000 (20:48 +0100)]
matroskadec: fix stupid typo (!= -> ==)

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agobuild: remove duplicates from order-only directory prerequisite list
Diego Biurrun [Sun, 10 Jul 2011 19:05:45 +0000 (21:05 +0200)]
build: remove duplicates from order-only directory prerequisite list

This reduces startup latency for make invocations, which is especially
noticeable on systems that are slow or have slow I/O, like Windows.

8 years agobuild: rework rules for things in the tools dir
Mans Rullgard [Sun, 10 Jul 2011 19:26:25 +0000 (20:26 +0100)]
build: rework rules for things in the tools dir

Declaring tools associated with each library in their respective
makefiles allows these tools to easily depend on the correct
prerequisites and link against the libs they need.

Signed-off-by: Mans Rullgard <mans@mansr.com>