OSDN Git Service

coroid/ffmpeg_saccubus.git
13 years agoSupport 16-bit in yadif
James Darnley [Wed, 24 Nov 2010 20:25:09 +0000 (21:25 +0100)]
Support 16-bit in yadif

13 years agosupport more than yuv420p in yadif
James Darnley [Tue, 5 Apr 2011 00:45:10 +0000 (02:45 +0200)]
support more than yuv420p in yadif

(and correctly support grey8)

13 years agoRedefine sameq
Lou Logan [Mon, 28 Mar 2011 20:13:44 +0000 (12:13 -0800)]
Redefine sameq

I think the documentation of sameq is causing confusion and misuse of
this option.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agofix runtime-cpu-detect bug in swscale
Darren Horrocks [Tue, 5 Apr 2011 00:34:26 +0000 (02:34 +0200)]
fix runtime-cpu-detect bug in swscale

swscale doesnt ever actually do any runtime detection at all when
runtime cpu detection is enabled, it simply passes whatever is passed
to -sws_flags, which could be nothing at all making swscale default to
the C implementation.

13 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Tue, 5 Apr 2011 00:24:55 +0000 (02:24 +0200)]
Merge remote branch 'qatar/master'

* qatar/master: (22 commits)
  ac3enc: move extract_exponents inner loop to ac3dsp
  avio: deprecate url_get_filename().
  avio: deprecate url_max_packet_size().
  avio: make url_get_file_handle() internal.
  avio: make url_filesize() internal.
  avio: make url_close() internal.
  avio: make url_seek() internal.
  avio: cosmetics, move AVSEEK_SIZE/FORCE declarations together
  avio: make url_write() internal.
  avio: make url_read_complete() internal.
  avio: make url_read() internal.
  avio: make url_open() internal.
  avio: make url_connect internal.
  avio: make url_alloc internal.
  applehttp: Merge two for loops
  applehttp: Restructure the demuxer to use a custom AVIOContext
  applehttp: Move finished and target_duration to the variant struct
  aacenc: reduce the number of loop index variables
  avio: deprecate url_open_protocol
  avio: deprecate url_poll and URLPollEntry
  ...

Conflicts:
libavformat/applehttp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoretry_transfer_wrapper: only call interrupt callback when less than requested is...
Michael Niedermayer [Mon, 4 Apr 2011 23:58:03 +0000 (01:58 +0200)]
retry_transfer_wrapper: only call interrupt callback when less than requested is r/w.
Its a waste of cpu cycles otherwise

13 years agompegts: Put CODEC_ID_NONE check back that was removed by mistake in 5b56ad03
Michael Niedermayer [Mon, 4 Apr 2011 22:06:11 +0000 (00:06 +0200)]
mpegts: Put CODEC_ID_NONE check back that was removed by mistake in 5b56ad03

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoac3enc: move extract_exponents inner loop to ac3dsp
Mans Rullgard [Sat, 12 Mar 2011 22:16:49 +0000 (22:16 +0000)]
ac3enc: move extract_exponents inner loop to ac3dsp

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoavio: deprecate url_get_filename().
Anton Khirnov [Thu, 31 Mar 2011 16:00:55 +0000 (18:00 +0200)]
avio: deprecate url_get_filename().

URLContext.filename should be used directly.

13 years agoavio: deprecate url_max_packet_size().
Anton Khirnov [Thu, 31 Mar 2011 15:58:04 +0000 (17:58 +0200)]
avio: deprecate url_max_packet_size().

URLContext.max_packet_size should be used directly.

13 years agoavio: make url_get_file_handle() internal.
Anton Khirnov [Thu, 31 Mar 2011 15:51:24 +0000 (17:51 +0200)]
avio: make url_get_file_handle() internal.

13 years agoavio: make url_filesize() internal.
Anton Khirnov [Thu, 31 Mar 2011 15:46:00 +0000 (17:46 +0200)]
avio: make url_filesize() internal.

13 years agoavio: make url_close() internal.
Anton Khirnov [Thu, 31 Mar 2011 15:36:06 +0000 (17:36 +0200)]
avio: make url_close() internal.

13 years agoavio: make url_seek() internal.
Anton Khirnov [Thu, 31 Mar 2011 15:30:31 +0000 (17:30 +0200)]
avio: make url_seek() internal.

13 years agoavio: cosmetics, move AVSEEK_SIZE/FORCE declarations together
Anton Khirnov [Thu, 31 Mar 2011 15:26:09 +0000 (17:26 +0200)]
avio: cosmetics, move AVSEEK_SIZE/FORCE declarations together

13 years agoavio: make url_write() internal.
Anton Khirnov [Thu, 31 Mar 2011 14:48:01 +0000 (16:48 +0200)]
avio: make url_write() internal.

13 years agoavio: make url_read_complete() internal.
Anton Khirnov [Thu, 31 Mar 2011 14:40:31 +0000 (16:40 +0200)]
avio: make url_read_complete() internal.

13 years agoavio: make url_read() internal.
Anton Khirnov [Thu, 31 Mar 2011 14:31:43 +0000 (16:31 +0200)]
avio: make url_read() internal.

13 years agoavio: make url_open() internal.
Anton Khirnov [Thu, 31 Mar 2011 14:25:10 +0000 (16:25 +0200)]
avio: make url_open() internal.

13 years agoavio: make url_connect internal.
Anton Khirnov [Thu, 31 Mar 2011 14:10:50 +0000 (16:10 +0200)]
avio: make url_connect internal.

13 years agoavio: make url_alloc internal.
Anton Khirnov [Thu, 31 Mar 2011 14:04:59 +0000 (16:04 +0200)]
avio: make url_alloc internal.

13 years agoOnly make buffer smaller in fill_buffer() if read_packet() is set.
Carl Eugen Hoyos [Mon, 4 Apr 2011 14:43:15 +0000 (16:43 +0200)]
Only make buffer smaller in fill_buffer() if read_packet() is set.

Fixes a possible invalid free().

13 years agoCommunicate pulldown flags to clients to fix VC-1 playback with pulldown content
Alexandre Colucci [Mon, 4 Apr 2011 13:20:10 +0000 (15:20 +0200)]
Communicate pulldown flags to clients to fix VC-1 playback with pulldown content

The pulldown flags should be communicated to the client of the libavcodec library. Not doing so causes jerky playback with pulldown content. Note that this change requires the patch previously provided here: http://ffmpeg.org/pipermail/ffmpeg-devel/2011-April/110314.html

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoFix VC-1 playback with pulldown content
Alexandre Colucci [Mon, 4 Apr 2011 13:08:50 +0000 (15:08 +0200)]
Fix VC-1 playback with pulldown content

The attached patch fixes the jerky playback of VC-1 content with pulldown. The pulldown flags were incorrectly set. They must be correct in order to display the frames with the correct timing as mentioned in the specifications: "SMPTE 421M: VC-1 Compressed Video Bitstream Format and Decoding Process". More precisely the following tables:

Table 20: Progressive P picture layer bitstream for Advanced Profile
Table 22: Progressive B picture layer bitstream for Advanced Profile
Table 23: Progressive Skipped picture layer bitstream for Advanced Profile
Table 82: Interlaced Frame I and BI picture layer bitstream for Advanced Profile
Table 83: Interlaced Frame P picture layer bitstream for Advanced Profile
Table 84: Interlaced Frame B picture layer bitstream for Advanced Profile
Table 85: Picture Layer bitstream for Field 1 of Interlace Field Picture for Advanced Profile

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoapplehttp: Merge two for loops
Martin Storsjö [Sun, 20 Mar 2011 22:23:54 +0000 (00:23 +0200)]
applehttp: Merge two for loops

The previous commit didn't do this straight away, to keep the
diff slightly simpler.

13 years agoapplehttp: Restructure the demuxer to use a custom AVIOContext
Martin Storsjö [Sun, 20 Mar 2011 22:21:56 +0000 (00:21 +0200)]
applehttp: Restructure the demuxer to use a custom AVIOContext

This avoids issues where EOF at the end of the segment is given
the variant demuxer. Now the demuxers only see one single data
stream (as when using the applehttp protocol handler).

13 years agoapplehttp: Move finished and target_duration to the variant struct
Martin Storsjö [Sun, 20 Mar 2011 22:08:59 +0000 (00:08 +0200)]
applehttp: Move finished and target_duration to the variant struct

This is a preparation for a restructuring of the demuxer, to
minimize the later diff.

13 years agoaacenc: reduce the number of loop index variables
Young Han Lee [Thu, 31 Mar 2011 13:41:53 +0000 (22:41 +0900)]
aacenc: reduce the number of loop index variables

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
13 years agoavio: deprecate url_open_protocol
Anton Khirnov [Thu, 31 Mar 2011 14:00:49 +0000 (16:00 +0200)]
avio: deprecate url_open_protocol

The unbuffered API will be made private and it's not used anywhere
internally.

13 years agoavio: deprecate url_poll and URLPollEntry
Anton Khirnov [Thu, 31 Mar 2011 13:22:18 +0000 (15:22 +0200)]
avio: deprecate url_poll and URLPollEntry

They're unimplemented and nobody cared to do anything with that for
10 years.

13 years agoac3enc: select bandwidth based on bit rate, sample rate, and number of
Justin Ruggles [Mon, 28 Mar 2011 13:18:37 +0000 (09:18 -0400)]
ac3enc: select bandwidth based on bit rate, sample rate, and number of
full-bandwidth channels.

This reduces high-frequency artifacts and improves the quality of the lower
frequency audio at low bit rates.

13 years agoflvdec: fix segfault in amf_parse_object() due to NULL key
Justin Ruggles [Sun, 3 Apr 2011 19:15:36 +0000 (15:15 -0400)]
flvdec: fix segfault in amf_parse_object() due to NULL key

fixes Issue 2674

13 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Mon, 4 Apr 2011 00:15:12 +0000 (02:15 +0200)]
Merge remote branch 'qatar/master'

* qatar/master:
  fate: fix partial run when no samples path is specified
  ARM: NEON fixed-point forward MDCT
  ARM: NEON fixed-point FFT
  lavf: bump minor version and add an APIChanges entry for avio changes
  avio: simplify url_open_dyn_buf_internal by using avio_alloc_context()
  avio: make url_fdopen internal.
  avio: make url_open_dyn_packet_buf internal.
  avio: avio_ prefix for url_close_dyn_buf
  avio: avio_ prefix for url_open_dyn_buf
  avio: introduce an AVIOContext.seekable field
  ac3enc: use generic fixed-point mdct
  lavfi: add fade filter
  Change yadif to not use out of picture lines.
  lavc: deprecate AVCodecContext.antialias_algo
  lavc: mark mb_qmin/mb_qmax for removal on next major bump.

Conflicts:
doc/filters.texi
libavcodec/ac3enc_fixed.h
libavcodec/ac3enc_float.h
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/vf_fade.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoadd MicroDVD muxer and demuxer
Aurelien Jacobs [Fri, 10 Sep 2010 21:10:53 +0000 (23:10 +0200)]
add MicroDVD muxer and demuxer

Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>
13 years agoflvdec: fix segfault in amf_parse_object() due to NULL key
Justin Ruggles [Sun, 3 Apr 2011 19:18:36 +0000 (15:18 -0400)]
flvdec: fix segfault in amf_parse_object() due to NULL key

fixes Issue 2674

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoffmpeg: make 'bits_per_raw_sample' option more useful
Peter Ross [Sun, 3 Apr 2011 00:14:00 +0000 (10:14 +1000)]
ffmpeg: make 'bits_per_raw_sample' option more useful

Currently bits_per_raw_sample is exposed as an AVCodecContext option.
The option is not very useful, because ffmpeg 1) overwrites it with
a value from the upstream codec, or 2) it resets the value whenever
the video is resampled.

This patch adds the -bits_per_raw sample option to FFmpeg, and
caches the value like is done for the -pix_fmt option.

Example usage:
ffmpeg v210.avi -pix_fmt rgb48 -bits_per_raw_sample 10 out%d.dpx

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agofate: fix partial run when no samples path is specified
Mans Rullgard [Sun, 3 Apr 2011 22:12:16 +0000 (23:12 +0100)]
fate: fix partial run when no samples path is specified

This restores the behaviour of running only the builtin
regression tests when no path to external samples is given.
aa3805a inadvertently broke this by always setting SAMPLES
to something.  Using := makes the ifdef test work as expected
when the FATE_SAMPLES environment variable is empty.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoARM: NEON fixed-point forward MDCT
Mans Rullgard [Mon, 28 Mar 2011 18:39:44 +0000 (19:39 +0100)]
ARM: NEON fixed-point forward MDCT

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoARM: NEON fixed-point FFT
Mans Rullgard [Sun, 27 Mar 2011 09:26:58 +0000 (10:26 +0100)]
ARM: NEON fixed-point FFT

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agolavf: bump minor version and add an APIChanges entry for avio changes
Anton Khirnov [Thu, 17 Mar 2011 12:42:45 +0000 (13:42 +0100)]
lavf: bump minor version and add an APIChanges entry for avio changes

13 years agoavio: simplify url_open_dyn_buf_internal by using avio_alloc_context()
Anton Khirnov [Sun, 3 Apr 2011 20:55:31 +0000 (22:55 +0200)]
avio: simplify url_open_dyn_buf_internal by using avio_alloc_context()

13 years agoLibavcodec AC3/E-AC3/DTS decoders now output floating point data.
clsid2 [Mon, 7 Mar 2011 00:08:34 +0000 (00:08 +0000)]
Libavcodec AC3/E-AC3/DTS decoders now output floating point data.

git-svn-id: https://ffdshow-tryout.svn.sourceforge.net/svnroot/ffdshow-tryout@3769 3b938f2f-1a1a-0410-8054-a526ea5ff92c

13 years agoFloat output for libavcodec AAC decoder
clsid2 [Mon, 7 Mar 2011 00:28:50 +0000 (00:28 +0000)]
Float output for libavcodec AAC decoder

git-svn-id: https://ffdshow-tryout.svn.sourceforge.net/svnroot/ffdshow-tryout@3770 3b938f2f-1a1a-0410-8054-a526ea5ff92c

13 years agoFloat output for libavcodec Vorbis decoder
clsid2 [Mon, 7 Mar 2011 00:46:59 +0000 (00:46 +0000)]
Float output for libavcodec Vorbis decoder

git-svn-id: https://ffdshow-tryout.svn.sourceforge.net/svnroot/ffdshow-tryout@3771 3b938f2f-1a1a-0410-8054-a526ea5ff92c

13 years agoavio: make url_fdopen internal.
Anton Khirnov [Thu, 17 Mar 2011 07:44:44 +0000 (08:44 +0100)]
avio: make url_fdopen internal.

The unbuffered URLContext API will be made private, so there's no point
in this function being public.

13 years agoavio: make url_open_dyn_packet_buf internal.
Anton Khirnov [Thu, 17 Mar 2011 07:19:54 +0000 (08:19 +0100)]
avio: make url_open_dyn_packet_buf internal.

It doesn't look fit to be a part of the public API.

Adding a temporary hack to ffserver to be able to use it, should be
cleaned up when somebody is up for it.

13 years agoavio: avio_ prefix for url_close_dyn_buf
Anton Khirnov [Thu, 17 Mar 2011 07:16:07 +0000 (08:16 +0100)]
avio: avio_ prefix for url_close_dyn_buf

13 years agoavio: avio_ prefix for url_open_dyn_buf
Anton Khirnov [Thu, 17 Mar 2011 07:13:34 +0000 (08:13 +0100)]
avio: avio_ prefix for url_open_dyn_buf

13 years agoavio: introduce an AVIOContext.seekable field
Anton Khirnov [Sat, 5 Mar 2011 20:06:46 +0000 (21:06 +0100)]
avio: introduce an AVIOContext.seekable field

Use it instead of url_is_streamed and AVIOContext.is_streamed.

13 years agoRemove superfluous free().
Carl Eugen Hoyos [Sun, 3 Apr 2011 20:45:16 +0000 (22:45 +0200)]
Remove superfluous free().

13 years agoac3enc: use generic fixed-point mdct
Mans Rullgard [Mon, 21 Mar 2011 18:07:59 +0000 (18:07 +0000)]
ac3enc: use generic fixed-point mdct

This makes the AC3 encoder use the shared fixed-point MDCT rather
than its own implementation.  The checksum changes are due to
different rounding in the MDCT.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoMove frame_pred_frame_dct check elsewhere.
Michael Niedermayer [Thu, 10 Mar 2011 10:48:43 +0000 (11:48 +0100)]
Move frame_pred_frame_dct check elsewhere.
Fixes issue2405

13 years agoFix mpeg-ps misdetected as m4v.
Michael Niedermayer [Thu, 10 Mar 2011 09:32:46 +0000 (10:32 +0100)]
Fix mpeg-ps misdetected as m4v.
Fix issue2326

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoFix issue2246
Michael Niedermayer [Wed, 9 Mar 2011 16:03:09 +0000 (17:03 +0100)]
Fix issue2246
ignore last ctts duration
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoSupport changing pixel formats on avfilter input.
Michael Niedermayer [Wed, 9 Mar 2011 14:13:59 +0000 (15:13 +0100)]
Support changing pixel formats on avfilter input.
Fix issue2217
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoImprove codec_tag guessing code.
Michael Niedermayer [Wed, 9 Mar 2011 14:12:24 +0000 (15:12 +0100)]
Improve codec_tag guessing code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoMake find_pix_fmt() non static
Michael Niedermayer [Wed, 9 Mar 2011 14:11:50 +0000 (15:11 +0100)]
Make find_pix_fmt() non static
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoDont leak sws contexts.
Michael Niedermayer [Wed, 9 Mar 2011 02:30:24 +0000 (03:30 +0100)]
Dont leak sws contexts.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agofixed issue1962 EVO detection
Michael Niedermayer [Wed, 9 Mar 2011 00:07:35 +0000 (01:07 +0100)]
fixed issue1962 EVO detection

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoFix issue2437
Michael Niedermayer [Tue, 8 Mar 2011 21:39:14 +0000 (22:39 +0100)]
Fix issue2437

13 years agoReimplement stream probe try #2
Michael Niedermayer [Fri, 4 Mar 2011 00:12:17 +0000 (01:12 +0100)]
Reimplement stream probe try #2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoPartial rewrite stream probe code.
Michael Niedermayer [Tue, 1 Mar 2011 19:17:33 +0000 (20:17 +0100)]
Partial rewrite stream probe code.
Fix issue2312.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoDont be so picky on decoding pps in extradata.
Michael Niedermayer [Tue, 1 Mar 2011 14:59:00 +0000 (15:59 +0100)]
Dont be so picky on decoding pps in extradata.
Fixes issue2517

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoFix yuvj420p scaling artefact, issue1108.
Michael Niedermayer [Fri, 25 Feb 2011 01:46:12 +0000 (02:46 +0100)]
Fix yuvj420p scaling artefact, issue1108.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoCorrectly implement:
Michael Niedermayer [Sat, 26 Feb 2011 21:51:56 +0000 (22:51 +0100)]
Correctly implement:
commit c0ec9918b066c6bfca8613ac75b589bd3e405971
Author: Måns Rullgård <mans@mansr.com>
Date:   Tue Aug 24 17:47:05 2010 +0000
Remove global mm_flags variable

Originally committed as revision 24909 to svn://svn.ffmpeg.org/ffmpeg/trunk

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoAdd sign off recommandition and definition of meaning.
Michael Niedermayer [Sun, 3 Apr 2011 09:01:20 +0000 (11:01 +0200)]
Add sign off recommandition and definition of meaning.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoReword make fate patch checklist entry
compn [Sun, 3 Apr 2011 08:45:20 +0000 (10:45 +0200)]
Reword make fate patch checklist entry

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agolavfi: add fade filter
Brandon Mintern [Mon, 21 Feb 2011 11:02:57 +0000 (12:02 +0100)]
lavfi: add fade filter

Port fade filter from libavfilter soc repo, with minor fixes by
Stefano.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
13 years agoChange yadif to not use out of picture lines.
Michael Niedermayer [Fri, 18 Feb 2011 18:10:33 +0000 (19:10 +0100)]
Change yadif to not use out of picture lines.

Fixes issue2272.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
13 years agolavc: deprecate AVCodecContext.antialias_algo
Anton Khirnov [Sat, 2 Apr 2011 11:34:12 +0000 (13:34 +0200)]
lavc: deprecate AVCodecContext.antialias_algo

It's been unused since mp3float decoder was added.

13 years agolavc: mark mb_qmin/mb_qmax for removal on next major bump.
Anton Khirnov [Sat, 2 Apr 2011 11:18:00 +0000 (13:18 +0200)]
lavc: mark mb_qmin/mb_qmax for removal on next major bump.

They've been unused and deprecated for about five years.

13 years agoAdd or elaborate on some documentation comments in avcodec.h.
Wim Lewis [Sat, 2 Apr 2011 22:30:24 +0000 (15:30 -0700)]
Add or elaborate on some documentation comments in avcodec.h.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agopatch checklist:git format-patch
Michael Niedermayer [Sun, 3 Apr 2011 00:47:17 +0000 (02:47 +0200)]
patch checklist:git format-patch
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agopatch checklist:uggest fate instead of regression tests
Michael Niedermayer [Sun, 3 Apr 2011 00:45:27 +0000 (02:45 +0200)]
patch checklist:uggest fate instead of regression tests
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agopatch checklist:Remove pointless checkheaders comment, its just a waste of time
Michael Niedermayer [Sun, 3 Apr 2011 00:44:17 +0000 (02:44 +0200)]
patch checklist:Remove pointless checkheaders comment, its just a waste of time
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agolavf: inspect more frames for fps when container time base is coarse
Anssi Hannula [Mon, 28 Feb 2011 00:20:56 +0000 (02:20 +0200)]
lavf: inspect more frames for fps when container time base is coarse

As per issue2629, most 23.976fps matroska H.264 files are incorrectly
detected as 24fps, as the matroska timestamps usually have only
millisecond precision.

Fix that by doubling the amount of timestamps inspected for frame rate
for streams that have coarse time base. This also fixes 29.970 detection
in matroska.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Sun, 3 Apr 2011 00:28:01 +0000 (02:28 +0200)]
Merge remote branch 'qatar/master'

* qatar/master:
  Fixed-point MDCT with 32-bit unscaled output
  lavc: deprecate rate_emu
  lavc: mark hurry_up for removal on next major bump
  parser: mark av_parser_parse() for removal on next major bump
  lavc: add missing audioconvert includes
  jvdec: don't use deprecated CODEC_TYPE_*/PKT_FLAG_KEY

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoRevert "configure: use dlltools instead of lib.exe"
Michael Niedermayer [Sun, 3 Apr 2011 00:06:31 +0000 (02:06 +0200)]
Revert "configure: use dlltools instead of lib.exe"
Reason, is this was requested by the windows experts / seems dlltool causes alot of problems

This reverts commit ec10a9ab461b26b96eff7bbbb8623f42d8ee04ad.

Conflicts:

configure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoFixed-point MDCT with 32-bit unscaled output
Mans Rullgard [Mon, 21 Mar 2011 17:52:34 +0000 (17:52 +0000)]
Fixed-point MDCT with 32-bit unscaled output

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoyadif:Fix assert() failure
Michael Niedermayer [Sat, 2 Apr 2011 18:26:39 +0000 (20:26 +0200)]
yadif:Fix assert() failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agodpx:fix typo
Michael Niedermayer [Sat, 2 Apr 2011 17:26:47 +0000 (19:26 +0200)]
dpx:fix typo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agocosmetics: indentation
Peter Ross [Sat, 2 Apr 2011 04:59:44 +0000 (15:59 +1100)]
cosmetics: indentation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agodpx encoder: support 10-bit packing method
Peter Ross [Sat, 2 Apr 2011 04:59:28 +0000 (15:59 +1100)]
dpx encoder: support 10-bit packing method

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agodpx decoder: read sample aspect ratio
Peter Ross [Fri, 1 Apr 2011 12:23:28 +0000 (23:23 +1100)]
dpx decoder: read sample aspect ratio

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoH264: fix slice end error detection
Michael Niedermayer [Sat, 2 Apr 2011 15:59:10 +0000 (17:59 +0200)]
H264: fix slice end error detection
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoh264: change a few comments into error messages
Michael Niedermayer [Sat, 2 Apr 2011 15:57:53 +0000 (17:57 +0200)]
h264: change a few comments into error messages
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agolavc: deprecate rate_emu
Anton Khirnov [Sat, 2 Apr 2011 10:51:28 +0000 (12:51 +0200)]
lavc: deprecate rate_emu

It's not used anywhere and apparrently hasn't been for a very long time.

13 years agolavc: mark hurry_up for removal on next major bump
Anton Khirnov [Sat, 2 Apr 2011 09:56:21 +0000 (11:56 +0200)]
lavc: mark hurry_up for removal on next major bump

It has been deprecated for about five years, skip_idct/skip_frame should
be used instead.

13 years agoparser: mark av_parser_parse() for removal on next major bump
Anton Khirnov [Sat, 2 Apr 2011 09:55:04 +0000 (11:55 +0200)]
parser: mark av_parser_parse() for removal on next major bump

Fixes build with the bump, since the prototype is already marked for
removal.

13 years agolavc: add missing audioconvert includes
Anton Khirnov [Sat, 2 Apr 2011 09:50:10 +0000 (11:50 +0200)]
lavc: add missing audioconvert includes

13 years agojvdec: don't use deprecated CODEC_TYPE_*/PKT_FLAG_KEY
Anton Khirnov [Sat, 2 Apr 2011 09:35:14 +0000 (11:35 +0200)]
jvdec: don't use deprecated CODEC_TYPE_*/PKT_FLAG_KEY

13 years agoFix stream mapping regression
Michael Niedermayer [Sat, 2 Apr 2011 14:09:47 +0000 (16:09 +0200)]
Fix stream mapping regression

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agodrawtext: extend/clarify examples in the filter description
Stefano Sabatini [Sat, 2 Apr 2011 09:42:16 +0000 (11:42 +0200)]
drawtext: extend/clarify examples in the filter description

13 years agodrawtext: fix wrong reference in boxcolor option description
Stefano Sabatini [Sat, 2 Apr 2011 09:29:43 +0000 (11:29 +0200)]
drawtext: fix wrong reference in boxcolor option description

13 years agodrawtext: add documentation for the shadow parameters
Stefano Sabatini [Sat, 2 Apr 2011 09:27:09 +0000 (11:27 +0200)]
drawtext: add documentation for the shadow parameters

13 years agodrawtext: allow negative shadow offset values
Stefano Sabatini [Sat, 2 Apr 2011 09:26:41 +0000 (11:26 +0200)]
drawtext: allow negative shadow offset values

13 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Fri, 1 Apr 2011 23:51:44 +0000 (01:51 +0200)]
Merge remote branch 'qatar/master'

* qatar/master:
  ac3enc: ARM optimised ac3_compute_matissa_size
  ac3: armv6 optimised bit_alloc_calc_bap
  fate: simplify fft test rules
  avio: document avio_alloc_context.
  lavf: make compute_chapters_end less picky.
  sierravmd: fix Indeo3 videos
  FFT: simplify fft8()
  fate: add fixed-point fft/mdct tests
  Fixed-point support in fft-test
  ape: check that number of seektable entries is equal to number of frames

Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoTimeout TCP open() after 5 seconds.
Michael Niedermayer [Fri, 1 Apr 2011 22:29:07 +0000 (00:29 +0200)]
Timeout TCP open() after 5 seconds.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoFix compilation with --disable-vdpau
Carl Eugen Hoyos [Fri, 1 Apr 2011 22:50:39 +0000 (00:50 +0200)]
Fix compilation with --disable-vdpau

13 years agoMake a plausibility check when setting channel layout for TrueHD.
Carl Eugen Hoyos [Fri, 1 Apr 2011 22:48:43 +0000 (00:48 +0200)]
Make a plausibility check when setting channel layout for TrueHD.

TrueHD supports more channels than FFmpeg, so a valid sample
could set the channel layout to a value that represents less
channels than the sample actually consists of.