ffmpeg.git
8 years agorename wtv.c to wtvdec.c
zhentan feng [Sun, 1 May 2011 19:10:00 +0000 (21:10 +0200)]
rename wtv.c to wtvdec.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix data_size handling for AC3 and dca decoders.
Reimar Döffinger [Sat, 30 Apr 2011 21:19:04 +0000 (23:19 +0200)]
Fix data_size handling for AC3 and dca decoders.

They use now code identical to the AAC decoder.
The AC3 decoder previously did not check the data_size and
the dca decoder checked against and set wrong values for float.

8 years agolavfi: rename AVFilterBufferRefVideoProps.pixel_aspect to sample_aspect_ratio
Stefano Sabatini [Fri, 29 Apr 2011 11:12:39 +0000 (13:12 +0200)]
lavfi: rename AVFilterBufferRefVideoProps.pixel_aspect to sample_aspect_ratio

Improve consistency with libavcodec.

This breaks libavfilter API/ABI.

The non-sequential 2.1.0 -> 2.4.0 bump is due to the mess previously
done with the lavfi minor number.

8 years agolavc: add a sample_aspect_ratio field to AVFrame
Stefano Sabatini [Fri, 29 Apr 2011 11:04:47 +0000 (13:04 +0200)]
lavc: add a sample_aspect_ratio field to AVFrame

The sample aspect ratio is a per-frame property, so it makes sense to
define it in AVFrame rather than in the codec/stream context.
Simplify application-level sample aspect ratio information extraction,
and allow further simplifications.

8 years agolavc: add a pkt_pos field to AVFrame
Stefano Sabatini [Fri, 29 Apr 2011 10:28:44 +0000 (12:28 +0200)]
lavc: add a pkt_pos field to AVFrame

This is similar to what was done with pkt_pts. This simplifies the
operation of extracting the pos information from the AVPacket, and
allows further simplifications.

8 years agoFix compilation in some cases if the flac decoder was disabled.
Carl Eugen Hoyos [Sun, 1 May 2011 04:39:08 +0000 (06:39 +0200)]
Fix compilation in some cases if the flac decoder was disabled.

flac.o implies vorbis_data.o because of flac channel layout.

8 years agoH264: Fix intra only decoding.
Michael Niedermayer [Sun, 1 May 2011 00:32:41 +0000 (02:32 +0200)]
H264: Fix intra only decoding.
This possibly fixes issue2679
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoH264:Print short+long+max values when they dont match up.
Michael Niedermayer [Sun, 1 May 2011 00:32:16 +0000 (02:32 +0200)]
H264:Print short+long+max values when they dont match up.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoH264:use av_assert0() for frame num check
Michael Niedermayer [Sun, 1 May 2011 00:31:42 +0000 (02:31 +0200)]
H264:use av_assert0() for frame num check
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoH264: print nal_ref_idc too for debug
Michael Niedermayer [Sun, 1 May 2011 00:31:01 +0000 (02:31 +0200)]
H264: print nal_ref_idc too for debug
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix decoding of mpegts streams with h264 video that does *NOT* have b frames
Mike Scheutzow [Thu, 28 Apr 2011 14:14:26 +0000 (10:14 -0400)]
Fix decoding of mpegts streams with h264 video that does *NOT* have b frames

One of the causes of this bug is that the h264 parser defaults low_delay
to 1, but the h264 codec defaults low_delay to 0. Really Ugly.

After many hours of looking at this, I'm still not sure how has_b_frames
is *intended* to behave, but to me the implementation appears way more
complicated than it ought to be.

My patch relies on the encoder to set an optional field in the SPS. This
works for libx264 streams, but I'm not sure that all h264 encoders will
set it.

8 years agolavc: lowercase the FRWU codec name
ami_stuff [Sat, 30 Apr 2011 22:38:25 +0000 (00:38 +0200)]
lavc: lowercase the FRWU codec name

This is more consistent with all the other codec names.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agoMerge commit '85770f2a2651497861ed938efcd0df3696ff5e45'
Michael Niedermayer [Sat, 30 Apr 2011 22:21:56 +0000 (00:21 +0200)]
Merge commit '85770f2a2651497861ed938efcd0df3696ff5e45'

* commit '85770f2a2651497861ed938efcd0df3696ff5e45':
  AVOptions: make default_val a union, as proposed in AVOption2.
  Move ff_dynarray_add to lavu and make it public.
  lavf: remove duplicate assignment in avformat_alloc_context.
  lavf: use designated initializers for AVClasses.
  options: simplify av_find_opt by using av_next_option.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoDo not drop packets with no valid ->pos set as e.g. DV-in-AVI produces.
Reimar Döffinger [Sat, 30 Apr 2011 09:49:49 +0000 (11:49 +0200)]
Do not drop packets with no valid ->pos set as e.g. DV-in-AVI produces.

Fixes ticket #140.

8 years agoFFMPEG: support demuxer specific options.
Michael Niedermayer [Sat, 30 Apr 2011 19:38:40 +0000 (21:38 +0200)]
FFMPEG: support demuxer specific options.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoAVIDEC: use_odmc demuxer specific option. (mostly an exmaple for demuxer specific...
Michael Niedermayer [Sat, 30 Apr 2011 19:37:11 +0000 (21:37 +0200)]
AVIDEC: use_odmc demuxer specific option. (mostly an exmaple for demuxer specific options)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoLAVFAPI: demuxer specific options.
Michael Niedermayer [Sat, 30 Apr 2011 19:35:48 +0000 (21:35 +0200)]
LAVFAPI: demuxer specific options.
(someone please add doxy)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agooutput_example: use avformat_alloc_output_context()
Michael Niedermayer [Sat, 30 Apr 2011 18:44:09 +0000 (20:44 +0200)]
output_example: use avformat_alloc_output_context()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoLAVFAPI: avformat_alloc_output_context() / simplify usage of muxers.
Michael Niedermayer [Sat, 30 Apr 2011 18:43:16 +0000 (20:43 +0200)]
LAVFAPI: avformat_alloc_output_context() / simplify usage of muxers.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoLAVF API: remove AVOutputFormat.set_parameters() the field is unused.
Michael Niedermayer [Sat, 30 Apr 2011 18:03:16 +0000 (20:03 +0200)]
LAVF API: remove AVOutputFormat.set_parameters() the field is unused.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoCrystalHD: Add auto-detection of packed b-frame bug.
Philip Langdale [Thu, 21 Apr 2011 04:43:29 +0000 (21:43 -0700)]
CrystalHD: Add auto-detection of packed b-frame bug.

I still don't fully understand the cause but the difference between
the samples that trigger the bug and the samples that don't is
that the former uses delay frames and the later uses drop frames
as placeholders for the packed frame. So, if we see the one type
of frame, we can assume the bug will or won't be present.

Right now, I'm detecting the frame types by size, which may not be
safe in general, but given the specific codec and file type, I
expect any scenario where we encounter these frames where they
aren't being used for b-frame packing won't care one way or
another whether the work around is in effect or not.

Signed-off-by: Philip Langdale <philipl@overt.org>
8 years agolavc: remove disabled avcodec_decode_video() code
Stefano Sabatini [Sat, 30 Apr 2011 09:55:06 +0000 (11:55 +0200)]
lavc: remove disabled avcodec_decode_video() code

Fix warning:
libavcodec/utils.c: At top level:
libavcodec/utils.c:714:5: warning: "FF_API_VIDEO_OLD" is not defined

Also fix trac issue #139.

8 years agoRead the album_artist, grouping and lyrics metadata.
Reimar Döffinger [Sun, 24 Apr 2011 15:02:09 +0000 (17:02 +0200)]
Read the album_artist, grouping and lyrics metadata.

Our muxer writes these out, so we really should support reading them.
Fixes ticket #30.

8 years agoAVOptions: make default_val a union, as proposed in AVOption2.
Anton Khirnov [Sat, 30 Apr 2011 05:43:26 +0000 (07:43 +0200)]
AVOptions: make default_val a union, as proposed in AVOption2.

This breaks API and ABI.

8 years agoIn libx264 wrapper, change wpredp to a codec specific option.
Baptiste Coudurier [Fri, 29 Apr 2011 21:13:19 +0000 (14:13 -0700)]
In libx264 wrapper, change wpredp to a codec specific option.

8 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Fri, 29 Apr 2011 23:40:29 +0000 (01:40 +0200)]
Merge remote branch 'qatar/master'

* qatar/master:
Duplicate  AMV: disable DR1 and don't override EMU_EDGE
Duplicate  lavf: inspect more frames for fps when container time base is coarse
Wrong and we have correct fix: Fix races in default av_log handler
  vorbis: Replace sized int_fast integer types with plain int/unsigned.
  Remove disabled non-optimized code variants.
NO  bswap.h: Remove disabled code.
  Remove some disabled printf debug cruft.
  Replace more disabled printf() calls by av_dlog().
NO  tests: Remove disabled code.
NO  Replace some commented-out debug printf() / av_log() messages with av_dlog().
  vorbisdec: Replace some sizeof(type) by sizeof(*variable).
NO  vf_fieldorder: Replace FFmpeg by Libav in license boilerplate.

Conflicts:
libavcodec/h264.c
libavcodec/vorbisdec.c
libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoAMV: disable DR1 and don't override EMU_EDGE
Michael Niedermayer [Thu, 28 Apr 2011 19:10:04 +0000 (21:10 +0200)]
AMV: disable DR1 and don't override EMU_EDGE

This works around a possibly exploitable crash.
Appearently, vlc can be exploited with a malicous file. This should get
reverted as soon as a proper fix is found.

Reported-at: Thu, 21 Apr 2011 14:38:25 +0000
Reported-by: Dominic Chell <Dominic.Chell@ngssecure.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 89f903b3d5ec38c9c5d90fba7e626fa0eda61a32)
(cherry picked from commit 9b919571e506fbb72b81a35ca1e7c1bd6efc4209)

8 years agolavf: inspect more frames for fps when container time base is coarse
Anssi Hannula [Thu, 28 Apr 2011 18:47:40 +0000 (20:47 +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>
(cherry picked from commit 78431098f9e306ebe27e7698d0ae539e3df2afe9)

Tested with mplayer based on this report
http://thread.gmane.org/gmane.comp.video.mplayer.user/66043/focus=66063

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agoFix races in default av_log handler
Reinhard Tartler [Wed, 27 Apr 2011 19:21:54 +0000 (21:21 +0200)]
Fix races in default av_log handler

Prevent competing threads from overwriting (shared) buffers.

Original patch by: Michael Niedermayer <michaelni@gmx.at>

8 years agoflashsv2enc: regression test.
Michael Niedermayer [Fri, 29 Apr 2011 19:53:25 +0000 (21:53 +0200)]
flashsv2enc: regression test.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovorbis: Replace sized int_fast integer types with plain int/unsigned.
Diego Biurrun [Fri, 29 Apr 2011 18:12:48 +0000 (20:12 +0200)]
vorbis: Replace sized int_fast integer types with plain int/unsigned.

int/unsigned is the natural memory access type for CPUs, using sized types
for temporary variables, counters and similar just increases code size and
can possibly cause a slowdown.

8 years agoRemove disabled non-optimized code variants.
Diego Biurrun [Fri, 29 Apr 2011 17:46:10 +0000 (19:46 +0200)]
Remove disabled non-optimized code variants.

8 years agobswap.h: Remove disabled code.
Diego Biurrun [Fri, 29 Apr 2011 17:36:48 +0000 (19:36 +0200)]
bswap.h: Remove disabled code.

8 years agoRemove some disabled printf debug cruft.
Diego Biurrun [Fri, 29 Apr 2011 17:05:40 +0000 (19:05 +0200)]
Remove some disabled printf debug cruft.

8 years agoReplace more disabled printf() calls by av_dlog().
Diego Biurrun [Fri, 29 Apr 2011 17:18:46 +0000 (19:18 +0200)]
Replace more disabled printf() calls by av_dlog().

8 years agoflashsv2enc:fix segfault
Michael Niedermayer [Fri, 29 Apr 2011 16:31:17 +0000 (18:31 +0200)]
flashsv2enc:fix segfault
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agotests: Remove disabled code.
Diego Biurrun [Tue, 26 Apr 2011 12:26:23 +0000 (14:26 +0200)]
tests: Remove disabled code.

8 years agoMove ff_dynarray_add to lavu and make it public.
Anton Khirnov [Fri, 29 Apr 2011 15:33:38 +0000 (17:33 +0200)]
Move ff_dynarray_add to lavu and make it public.

8 years agoReplace some commented-out debug printf() / av_log() messages with av_dlog().
Diego Biurrun [Fri, 29 Apr 2011 15:27:01 +0000 (17:27 +0200)]
Replace some commented-out debug printf() / av_log() messages with av_dlog().

8 years agovorbisdec: Replace some sizeof(type) by sizeof(*variable).
Diego Biurrun [Thu, 28 Apr 2011 09:09:35 +0000 (11:09 +0200)]
vorbisdec: Replace some sizeof(type) by sizeof(*variable).

8 years agovf_fieldorder: Replace FFmpeg by Libav in license boilerplate.
Diego Biurrun [Thu, 28 Apr 2011 16:59:14 +0000 (18:59 +0200)]
vf_fieldorder: Replace FFmpeg by Libav in license boilerplate.

8 years agolavf: remove duplicate assignment in avformat_alloc_context.
Anton Khirnov [Fri, 29 Apr 2011 09:42:05 +0000 (11:42 +0200)]
lavf: remove duplicate assignment in avformat_alloc_context.

AVClass is already initialized in  avformat_get_context_defaults.

8 years agolavf: use designated initializers for AVClasses.
Anton Khirnov [Fri, 29 Apr 2011 09:30:02 +0000 (11:30 +0200)]
lavf: use designated initializers for AVClasses.

8 years agoSet channel layout for True Audio files.
Carl Eugen Hoyos [Fri, 29 Apr 2011 08:46:45 +0000 (10:46 +0200)]
Set channel layout for True Audio files.

This is not documented (and possibly not originally intended),
but it's what the current reference decoder does.

8 years agoFix channel layout for some stereo flac files.
Carl Eugen Hoyos [Fri, 29 Apr 2011 08:42:43 +0000 (10:42 +0200)]
Fix channel layout for some stereo flac files.

8 years agooptions: simplify av_find_opt by using av_next_option.
Anton Khirnov [Thu, 14 Apr 2011 07:10:54 +0000 (09:10 +0200)]
options: simplify av_find_opt by using av_next_option.

8 years agoChecksum update due to (should make fate green again)
Michael Niedermayer [Fri, 29 Apr 2011 03:00:45 +0000 (05:00 +0200)]
Checksum update due to (should make fate green again)
ffmpeg | branch: master | Anton Khirnov <anton@khirnov.net> | Tue Apr 26 09:59:07 2011 +0000| [f8fec0505294a4c05e5cfd9323e04258db465314] | committer: Anton Khirnov

mpegtsenc: make PMT PID really start on pmt_start_pid

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRevert "Fix url_fopen() flag values."
Michael Niedermayer [Fri, 29 Apr 2011 02:31:28 +0000 (04:31 +0200)]
Revert "Fix url_fopen() flag values."
No longer needed after martins change to the values.
Though this would have been nicer ABI wise but iam too lazy to maintain this difference

This reverts commit 183401b92419febf2c6aeaa2dfecdd16ad99bff8.

8 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Fri, 29 Apr 2011 02:29:21 +0000 (04:29 +0200)]
Merge remote branch 'qatar/master'

* qatar/master:
LOTS of duplicates ...
  avio: Fix the deprecated fallback URL-prefixed open flags
  avoid duplicate -lm in .pc files
  mpeg12: terminate mpeg2_video_profiles arrays
  network: Check POLLERR and POLLHUP in ff_network_wait_fd
  mpegtsenc: make PMT PID really start on pmt_start_pid
  nut format: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE
  rawvideo codec: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE
  hflip: make the filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats
  crop: make the filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats
  libswcale: PIX_FMT_BGR48LE and PIX_FMT_BGR48BE scaler implementation

Conflicts:
configure
libswscale/swscale.h
tests/ref/lavf/ts

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoflashsv2enc: mark encoder experimental
Michael Niedermayer [Fri, 29 Apr 2011 01:06:06 +0000 (03:06 +0200)]
flashsv2enc: mark encoder experimental
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoflashsv2enc: remove useless casts
Michael Niedermayer [Fri, 29 Apr 2011 00:43:12 +0000 (02:43 +0200)]
flashsv2enc: remove useless casts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoflashsv2enc: use av_freep()
Michael Niedermayer [Fri, 29 Apr 2011 00:41:13 +0000 (02:41 +0200)]
flashsv2enc: use av_freep()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoflashsv2enc: remove useless if()
Michael Niedermayer [Fri, 29 Apr 2011 00:40:22 +0000 (02:40 +0200)]
flashsv2enc: remove useless if()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoencoder for adobe's flash ScreenVideo2 codec
Joshua Warner [Fri, 29 Apr 2011 00:25:56 +0000 (02:25 +0200)]
encoder for adobe's flash ScreenVideo2 codec

8 years agoRevert "avparser: don't av_malloc(0)."
Michael Niedermayer [Fri, 29 Apr 2011 00:14:43 +0000 (02:14 +0200)]
Revert "avparser: don't av_malloc(0)."

This hack is no longer needed.

This reverts commit 191e08d113ef1d089c45c5fb6c95491e16dde86e.

8 years agoFix all malloc(0) issues
Michael Niedermayer [Fri, 29 Apr 2011 00:13:59 +0000 (02:13 +0200)]
Fix all malloc(0) issues
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRemove lowres support from cdgraphics decoder
ami_stuff [Thu, 28 Apr 2011 22:58:57 +0000 (00:58 +0200)]
Remove lowres support from cdgraphics decoder

The lowres support doesn't work correctly (crops the video), so let's remove it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoReduce max lowres from 5 to 3 in sp5x decoder
ami_stuff [Thu, 28 Apr 2011 22:47:36 +0000 (00:47 +0200)]
Reduce max lowres from 5 to 3 in sp5x decoder

lowres higher than 3 crashes ffmpeg/ffplay here

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRemove lowres support from pnm decoder
ami_stuff [Thu, 28 Apr 2011 22:41:28 +0000 (00:41 +0200)]
Remove lowres support from pnm decoder

The lowres support doesn't work correctly (crops the video), so let's remove it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRemove lowres support from png decoder
ami_stuff [Thu, 28 Apr 2011 21:45:24 +0000 (23:45 +0200)]
Remove lowres support from png decoder

The lowres support doesn't work correctly (crops the video), so let's remove it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavio: Fix the deprecated fallback URL-prefixed open flags
Martin Storsjö [Thu, 28 Apr 2011 07:36:44 +0000 (10:36 +0300)]
avio: Fix the deprecated fallback URL-prefixed open flags

While deprecated, they're totally useless as long as their values
are different from the AVIO_FLAG values that are used internally.
Currently, this leads to old libav applications still compiling
correctly (since we haven't removed the fallback wrappers), but
failing since the functions internally compare to the new AVIO_FLAG
values.

These should be removed at some point, but they aren't removed yet.
The intent is to be able to recompile an old application against
the new ABI without modifying the code, and this doesn't work
currently.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoTry to fix big endian fate
Michael Niedermayer [Thu, 28 Apr 2011 20:25:39 +0000 (22:25 +0200)]
Try to fix big endian fate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMJPEG encoder to write aspect ratio information
Niobos [Thu, 28 Apr 2011 18:23:19 +0000 (20:23 +0200)]
MJPEG encoder to write aspect ratio information

8 years agoFix buffering in qpeg in a way that allows direct rendering.
Michael Niedermayer [Thu, 28 Apr 2011 12:06:36 +0000 (14:06 +0200)]
Fix buffering in qpeg in a way that allows direct rendering.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix url_fopen() flag values.
Michael Niedermayer [Thu, 28 Apr 2011 11:11:37 +0000 (13:11 +0200)]
Fix url_fopen() flag values.
Reported by: Luca Abeni
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRevert "qpeg: use reget_buffer() in decode_frame()"
Michael Niedermayer [Thu, 28 Apr 2011 02:31:02 +0000 (04:31 +0200)]
Revert "qpeg: use reget_buffer() in decode_frame()"

This reverts commit f4e043ff63935a71b98a36bc98b501c36ceadb92.

8 years agoChange silly variable name "class" to "partition_class".
Carl Eugen Hoyos [Thu, 28 Apr 2011 09:20:08 +0000 (11:20 +0200)]
Change silly variable name "class" to "partition_class".

8 years agoavoid duplicate -lm in .pc files
Reinhard Tartler [Tue, 26 Apr 2011 16:34:31 +0000 (18:34 +0200)]
avoid duplicate -lm in .pc files

8 years agompeg12: terminate mpeg2_video_profiles arrays
Stefano Sabatini [Wed, 27 Apr 2011 23:42:56 +0000 (01:42 +0200)]
mpeg12: terminate mpeg2_video_profiles arrays

Make av_get_profile_name() return NULL if no profile is detected.

Fix trac issue #130, fix crash reading file tek3.m2v.
(cherry picked from commit e5d80c7b2d893422e2e60a97e08bfc48ca1684e6)

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoRead channel layout atom in mov files.
Carl Eugen Hoyos [Thu, 28 Apr 2011 08:47:40 +0000 (10:47 +0200)]
Read channel layout atom in mov files.

8 years agoClarify warning messages.
Carl Eugen Hoyos [Thu, 28 Apr 2011 08:47:00 +0000 (10:47 +0200)]
Clarify warning messages.

8 years agoMove channel chunk reading function to isom.c.
Carl Eugen Hoyos [Thu, 28 Apr 2011 08:45:32 +0000 (10:45 +0200)]
Move channel chunk reading function to isom.c.

Move ff_read_chan_chunk() to isom.c and rename it as ff_mov_read_chan().

8 years agonetwork: Check POLLERR and POLLHUP in ff_network_wait_fd
Gil Pedersen [Thu, 28 Apr 2011 07:27:40 +0000 (10:27 +0300)]
network: Check POLLERR and POLLHUP in ff_network_wait_fd

Previously, the function would lead to an infinite wait (by
returning AVERROR(EAGAIN)) on sockets indicating an error
via either of these poll flags.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agompegtsenc: make PMT PID really start on pmt_start_pid
Anton Khirnov [Tue, 26 Apr 2011 09:59:07 +0000 (09:59 +0000)]
mpegtsenc: make PMT PID really start on pmt_start_pid

8 years agonut format: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE
Peter Ross [Sat, 19 Mar 2011 13:25:18 +0000 (00:25 +1100)]
nut format: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agorawvideo codec: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE
Peter Ross [Sat, 19 Mar 2011 13:24:24 +0000 (00:24 +1100)]
rawvideo codec: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agohflip: make the filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats
Peter Ross [Sat, 19 Mar 2011 11:11:03 +0000 (22:11 +1100)]
hflip: make the filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agocrop: make the filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats
Peter Ross [Sat, 19 Mar 2011 11:05:53 +0000 (22:05 +1100)]
crop: make the filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agolibswcale: PIX_FMT_BGR48LE and PIX_FMT_BGR48BE scaler implementation
Peter Ross [Thu, 17 Mar 2011 10:07:18 +0000 (21:07 +1100)]
libswcale: PIX_FMT_BGR48LE and PIX_FMT_BGR48BE scaler implementation

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Thu, 28 Apr 2011 02:23:36 +0000 (04:23 +0200)]
Merge remote branch 'qatar/master'

* qatar/master:
  vorbisdec: Rename silly "class_" variable to plain "class".
  simple_idct_alpha: Drop some useless casts.
  Simplify av_log_missing_feature().
  ac3enc: remove check for mismatching channels and channel_layout
  If AVCodecContext.channels is 0 and AVCodecContext.channel_layout is non-zero, set channels based on channel_layout.
  If AVCodecContext.channel_layout and AVCodecContext.channels are both non-zero, check to make sure they do not contradict eachother.
  cosmetics: indentation
  Check AVCodec.supported_samplerates and AVCodec.channel_layouts in avcodec_open().
  aacdec: remove sf_scale and sf_offset.
  aacdec: use a scale of 2 in the LTP MDCT rather than doubling the coefficient table values from the spec.
  Define POW_SF2_ZERO in aac.h and use for ff_aac_pow2sf_tabp[] offsets instead of hardcoding 200 everywhere.
  Large intensity stereo and PNS indices are legal. Clip them instead of erroring out. A magnitude of 100 corresponds to 2^25 so the will most likely result in clipped output anyway.
  qpeg: use reget_buffer() in decode_frame()
  ultimotion: use reget_buffer() in ulti_decode_frame()
  smacker: remove unnecessary call to avctx->release_buffer in decode_frame()
  avparser: don't av_malloc(0).

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompeg12: terminate mpeg2_video_profiles arrays
Stefano Sabatini [Wed, 27 Apr 2011 23:42:56 +0000 (01:42 +0200)]
mpeg12: terminate mpeg2_video_profiles arrays

Make av_get_profile_name() return NULL if no profile is detected.

Fix trac issue #130, fix crash reading file tek3.m2v.

8 years agoFix caf channel layouts ITU_2_2 and DVD_6.
Carl Eugen Hoyos [Wed, 27 Apr 2011 22:10:55 +0000 (00:10 +0200)]
Fix caf channel layouts ITU_2_2 and DVD_6.

8 years agoReturn if memory allocation fails.
Carl Eugen Hoyos [Wed, 27 Apr 2011 22:09:46 +0000 (00:09 +0200)]
Return if memory allocation fails.

8 years ago100l, change #ifdef to #if
Baptiste Coudurier [Wed, 27 Apr 2011 21:24:19 +0000 (14:24 -0700)]
100l, change #ifdef to #if

8 years agoIn png decoder, only call png_init_mmx if HAVE_MMX is defined.
Baptiste Coudurier [Wed, 27 Apr 2011 20:57:39 +0000 (13:57 -0700)]
In png decoder, only call png_init_mmx if HAVE_MMX is defined.

8 years agoCorrectly support pal8 with alpha in libswscale, fix png pal8 with alpha.
Baptiste Coudurier [Wed, 27 Apr 2011 19:52:09 +0000 (21:52 +0200)]
Correctly support pal8 with alpha in libswscale, fix png pal8 with alpha.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoSet alpha of palettes to 0xff.
Baptiste Coudurier [Wed, 27 Apr 2011 19:49:45 +0000 (21:49 +0200)]
Set alpha of palettes to 0xff.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRename y400a to gray8a.
Baptiste Coudurier [Wed, 27 Apr 2011 19:36:30 +0000 (21:36 +0200)]
Rename y400a to gray8a.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix add_paeth_prediction_mmx for rgb48
Michael Niedermayer [Wed, 27 Apr 2011 17:54:32 +0000 (19:54 +0200)]
Fix add_paeth_prediction_mmx for rgb48
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomerge read and and in add_paeth_prediction
Michael Niedermayer [Wed, 27 Apr 2011 17:01:33 +0000 (19:01 +0200)]
merge read and and in add_paeth_prediction
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMove png mmx functions into x86/png_mmx.c, remove them from DSPContext.
Baptiste Coudurier [Wed, 27 Apr 2011 16:34:10 +0000 (18:34 +0200)]
Move png mmx functions into x86/png_mmx.c, remove them from DSPContext.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovorbisdec: Rename silly "class_" variable to plain "class".
Diego Biurrun [Wed, 27 Apr 2011 14:38:35 +0000 (16:38 +0200)]
vorbisdec: Rename silly "class_" variable to plain "class".

8 years agosimple_idct_alpha: Drop some useless casts.
Diego Biurrun [Wed, 27 Apr 2011 13:36:21 +0000 (15:36 +0200)]
simple_idct_alpha: Drop some useless casts.

8 years agoSimplify av_log_missing_feature().
Diego Biurrun [Wed, 27 Apr 2011 13:11:41 +0000 (15:11 +0200)]
Simplify av_log_missing_feature().

Do not print the results of the conditional call to av_log_ask_for_sample()
into the same line as the main output, separate the already long text.

8 years agoFix decoding of DXSA subtitles.
Alexandre Colucci [Wed, 27 Apr 2011 16:39:57 +0000 (18:39 +0200)]
Fix decoding of DXSA subtitles.

These have a DXSA tag and contain alpha in addition to
color values for palette.

8 years agoac3enc: remove check for mismatching channels and channel_layout
Justin Ruggles [Tue, 19 Apr 2011 23:06:52 +0000 (19:06 -0400)]
ac3enc: remove check for mismatching channels and channel_layout

8 years agoIf AVCodecContext.channels is 0 and AVCodecContext.channel_layout is
Justin Ruggles [Tue, 19 Apr 2011 23:03:47 +0000 (19:03 -0400)]
If AVCodecContext.channels is 0 and AVCodecContext.channel_layout is
non-zero, set channels based on channel_layout.

This allows the user to set only channel_layout and not channels.

8 years agoIf AVCodecContext.channel_layout and AVCodecContext.channels are both
Justin Ruggles [Tue, 19 Apr 2011 23:02:32 +0000 (19:02 -0400)]
If AVCodecContext.channel_layout and AVCodecContext.channels are both
non-zero, check to make sure they do not contradict eachother.

8 years agocosmetics: indentation
Justin Ruggles [Wed, 20 Apr 2011 20:59:39 +0000 (16:59 -0400)]
cosmetics: indentation

8 years agoCheck AVCodec.supported_samplerates and AVCodec.channel_layouts in
Justin Ruggles [Tue, 19 Apr 2011 22:50:20 +0000 (18:50 -0400)]
Check AVCodec.supported_samplerates and AVCodec.channel_layouts in
avcodec_open().

If the encoder has a channel_layouts list and AVCodecContext.channel_layout
is 0, then only print a warning and let the encoder decide how to handle it.