ffmpeg.git
6 years agocws2fws: check inflateInit return value
Michael Niedermayer [Fri, 26 Oct 2012 15:27:53 +0000 (17:27 +0200)]
cws2fws: check inflateInit return value

Fixes CID733722
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobit: check av_new_packet() return value
Paul B Mahol [Fri, 26 Oct 2012 15:31:00 +0000 (15:31 +0000)]
bit: check av_new_packet() return value

Fixes CID703626.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoexamples: fix doxy so they appear on the example page
Michael Niedermayer [Fri, 26 Oct 2012 14:32:32 +0000 (16:32 +0200)]
examples: fix doxy so they appear on the example page

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agormdec: fix null derefercne
Michael Niedermayer [Fri, 26 Oct 2012 14:18:09 +0000 (16:18 +0200)]
rmdec: fix null derefercne

Fixes CID733714
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agormdec: use av_assert for audio_pkt_cnt
Michael Niedermayer [Fri, 26 Oct 2012 14:04:30 +0000 (16:04 +0200)]
rmdec: use av_assert for audio_pkt_cnt

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 26 Oct 2012 12:55:15 +0000 (14:55 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: sanitise sparc vis check
  configure: recognise more sparc variants as --cpu argument
  build: Include HEADERS-yes in the HEADERS variable
  pcm: change references to raw to pcm
  ffv1: set the range coder state in decode_slice_header
  pcmdec: change default of channels parameter to 1

Conflicts:
libavformat/pcmdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: sanitise sparc vis check
Mans Rullgard [Thu, 25 Oct 2012 14:56:16 +0000 (15:56 +0100)]
configure: sanitise sparc vis check

It is wrong to force -mcpu=ultrasparc when checking for vis.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoconfigure: recognise more sparc variants as --cpu argument
Michael Kostylev [Thu, 25 Oct 2012 10:38:51 +0000 (11:38 +0100)]
configure: recognise more sparc variants as --cpu argument

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agocaf muxer: write metadata
Paul B Mahol [Thu, 25 Oct 2012 23:33:34 +0000 (23:33 +0000)]
caf muxer: write metadata

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge commit '1b891d17c531e8a63c2974aab4bf997ce70746f3'
Michael Niedermayer [Fri, 26 Oct 2012 12:07:04 +0000 (14:07 +0200)]
Merge commit '1b891d17c531e8a63c2974aab4bf997ce70746f3'

* commit '1b891d17c531e8a63c2974aab4bf997ce70746f3':
  avconv: fix bitrate report when writing to /dev/null
  avfilter: fix graphparser memleaks on error paths
  rawdec: remove ff_raw_read_header
  pcmdec: remove dependency from rawdec
  g722: refactor out of rawdec.c
  rawvideo: use a specific read_header

Conflicts:
ffmpeg.c
libavformat/Makefile
libavformat/rawdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoaacps: fix order of operands of ipdopd_reset().
Michael Niedermayer [Fri, 26 Oct 2012 00:18:31 +0000 (02:18 +0200)]
aacps: fix order of operands of ipdopd_reset().

With the current implementation this is purely cosmetic

Fixes CID732285
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoaacps: loose self assignment
Michael Niedermayer [Fri, 26 Oct 2012 00:15:43 +0000 (02:15 +0200)]
aacps: loose self assignment

Fixes CID604123
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoaacenc: replace scale factor warning by assert
Michael Niedermayer [Fri, 26 Oct 2012 00:11:20 +0000 (02:11 +0200)]
aacenc: replace scale factor warning by assert

The code would crash after printing the warning

Fixes CID717903, CID717904
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoaiffdec: read ID3 attached pictures
Matthieu Bouron [Thu, 25 Oct 2012 20:45:33 +0000 (22:45 +0200)]
aiffdec: read ID3 attached pictures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocafenc: make .long_name match demuxer
Paul B Mahol [Thu, 25 Oct 2012 23:04:13 +0000 (23:04 +0000)]
cafenc: make .long_name match demuxer

While here reindent .codec_tag .

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agotools: add ffescape utility
Stefano Sabatini [Mon, 15 Oct 2012 10:17:15 +0000 (12:17 +0200)]
tools: add ffescape utility

6 years agofraps: use meaningful error codes
Paul B Mahol [Thu, 25 Oct 2012 19:47:54 +0000 (19:47 +0000)]
fraps: use meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolvfdec: cosmetics: fix identation
Paul B Mahol [Thu, 25 Oct 2012 20:56:20 +0000 (20:56 +0000)]
lvfdec: cosmetics: fix identation

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/showspectrum: add sliding mode.
Clément Bœsch [Sun, 21 Oct 2012 19:01:18 +0000 (21:01 +0200)]
lavfi/showspectrum: add sliding mode.

6 years agolavd/lavfi: fix leak in case of failure
Stefano Sabatini [Thu, 25 Oct 2012 19:33:45 +0000 (21:33 +0200)]
lavd/lavfi: fix leak in case of failure

Jump to the common release code in case of failure.

6 years agolavfi/af_volumedetect: print stats in uninit().
Nicolas George [Wed, 17 Oct 2012 17:42:20 +0000 (19:42 +0200)]
lavfi/af_volumedetect: print stats in uninit().

If the stats are printed when request_frame on the input
returns EOF, then they are never printed if the filter is
not flushed, in particular when using the -t ffmpeg option.

Fix trac ticket #1727.

6 years agoRestore installation of libavutil/lzo.h after 2a91ada8282f18d2807abee5188225bba1b19bda
Alexis Ballier [Thu, 25 Oct 2012 12:54:45 +0000 (09:54 -0300)]
Restore installation of libavutil/lzo.h after 2a91ada8282f18d2807abee5188225bba1b19bda

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/vf_fps: allow to set the rounding method.
Nicolas George [Thu, 25 Oct 2012 15:58:08 +0000 (17:58 +0200)]
lavfi/vf_fps: allow to set the rounding method.

By default, fps selects frames near PTS 0, 0.5, 1.5, 2.5, etc.
With round=down, it selects the frames near PTS 0, 1, 2, 3, etc.

6 years agoffserver: fix printf argument type
Martin Ettl [Thu, 25 Oct 2012 16:34:32 +0000 (16:34 +0000)]
ffserver: fix printf argument type

6 years agobuild: Include HEADERS-yes in the HEADERS variable
Martin Storsjö [Thu, 25 Oct 2012 14:13:06 +0000 (17:13 +0300)]
build: Include HEADERS-yes in the HEADERS variable

This makes sure the previously always installed public header
lzo.h is installed if the LZO functionality is enabled.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agopcm: change references to raw to pcm
Luca Barbato [Mon, 1 Jan 2001 00:08:20 +0000 (01:08 +0100)]
pcm: change references to raw to pcm

6 years agodsicinav: return proper error code in case of malloc failure
Paul B Mahol [Thu, 25 Oct 2012 13:46:19 +0000 (13:46 +0000)]
dsicinav: return proper error code in case of malloc failure

Fixes null pointer dereference.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agodsicinav: return meaningful error code
Paul B Mahol [Thu, 25 Oct 2012 12:59:34 +0000 (12:59 +0000)]
dsicinav: return meaningful error code

While here remove redundant references in error message.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavconv: fix bitrate report when writing to /dev/null
Janne Grunau [Tue, 9 Oct 2012 21:22:49 +0000 (23:22 +0200)]
avconv: fix bitrate report when writing to /dev/null

avio_size() reports the filesize which returns 0 for /dev/null.
avio_tell() reports the current position.

Also handle errors from avio_tell().

6 years agoavfilter: fix graphparser memleaks on error paths
Janne Grunau [Tue, 9 Oct 2012 19:28:32 +0000 (21:28 +0200)]
avfilter: fix graphparser memleaks on error paths

Fixes CID700635, CID700636 and CID732274.

6 years agorawdec: remove ff_raw_read_header
Luca Barbato [Wed, 24 Oct 2012 17:53:32 +0000 (19:53 +0200)]
rawdec: remove ff_raw_read_header

It is not used anymore and is a kludge.

6 years agopcmdec: remove dependency from rawdec
Luca Barbato [Wed, 24 Oct 2012 17:15:50 +0000 (19:15 +0200)]
pcmdec: remove dependency from rawdec

The code shared is not actually shared with anything else.

6 years agog722: refactor out of rawdec.c
Luca Barbato [Wed, 24 Oct 2012 16:18:18 +0000 (18:18 +0200)]
g722: refactor out of rawdec.c

6 years agorawvideo: use a specific read_header
Luca Barbato [Wed, 24 Oct 2012 12:18:49 +0000 (14:18 +0200)]
rawvideo: use a specific read_header

ff_raw_read_header is used only for this demuxer for video.

6 years agomxfenc: Write MultipleDescriptor ref in Preface
Tomas Härdin [Thu, 25 Oct 2012 08:23:59 +0000 (10:23 +0200)]
mxfenc: Write MultipleDescriptor ref in Preface

Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoaacdec: reorder multiuplications to make code safer against too large input values.
Michael Niedermayer [Thu, 25 Oct 2012 11:42:02 +0000 (13:42 +0200)]
aacdec: reorder multiuplications to make code safer against too large input values.

Fixes CID700697
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 25 Oct 2012 11:15:58 +0000 (13:15 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avutil: Make LZO decoder code configure-time selectable
  avutil: Move memcpy_backptr() to mem.c
  configure: detect parisc64 automatically
  configure: detect ppc64 automatically
  configure: detect mips64 automatically
  configure: generalise 64-bit test
  smoothstreamingenc: Don't assume streams start from timestamp 0

Conflicts:
configure
libavutil/Makefile
libavutil/lzo.c
libavutil/lzo.h
libavutil/mem.c
libavutil/mem.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil: Make LZO decoder code configure-time selectable
Diego Biurrun [Thu, 18 Oct 2012 17:48:27 +0000 (19:48 +0200)]
avutil: Make LZO decoder code configure-time selectable

6 years agoavutil: Move memcpy_backptr() to mem.c
Diego Biurrun [Thu, 18 Oct 2012 17:27:51 +0000 (19:27 +0200)]
avutil: Move memcpy_backptr() to mem.c

The function is used elsewhere and does not belong with the LZO code.

6 years agompegvideo: fix lowres on field pictures
Michael Niedermayer [Thu, 25 Oct 2012 02:03:58 +0000 (04:03 +0200)]
mpegvideo: fix lowres on field pictures

Fixes Ticket1846

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: reenable some recently lost audio tests
Michael Niedermayer [Thu, 25 Oct 2012 01:13:32 +0000 (03:13 +0200)]
fate: reenable some recently lost audio tests

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: fix null ptr deref in psnr printing code
Michael Niedermayer [Wed, 24 Oct 2012 23:16:34 +0000 (01:16 +0200)]
ffmpeg: fix null ptr deref in psnr printing code

Fixes CID205005
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoroqaudioenc: remove dead code
Michael Niedermayer [Wed, 24 Oct 2012 23:01:17 +0000 (01:01 +0200)]
roqaudioenc: remove dead code

Fixes CID703669
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoqt-faststart: check return of ftello()
Michael Niedermayer [Wed, 24 Oct 2012 22:39:33 +0000 (00:39 +0200)]
qt-faststart: check return of ftello()

Fixes CID739863
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoasfdec: fixed signedness in comparission
Michael Niedermayer [Wed, 24 Oct 2012 22:35:55 +0000 (00:35 +0200)]
asfdec: fixed signedness in comparission

Fixes CID739864
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocmdutils: fix unclosed file on error
Michael Niedermayer [Wed, 24 Oct 2012 22:32:34 +0000 (00:32 +0200)]
cmdutils: fix unclosed file on error

Fixes CID739865
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomov_probe: use correct variable
Michael Niedermayer [Wed, 24 Oct 2012 22:23:29 +0000 (00:23 +0200)]
mov_probe: use correct variable

Fixes CID739867
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocmdutils: remove writes in never read variable
Michael Niedermayer [Wed, 24 Oct 2012 22:19:59 +0000 (00:19 +0200)]
cmdutils: remove writes in never read variable

Fixes CID739868
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/srtenc: set codec to subrip by default.
Clément Bœsch [Sun, 21 Oct 2012 01:12:04 +0000 (03:12 +0200)]
lavf/srtenc: set codec to subrip by default.

We don't have a text encoder yet, so this commit makes automatic
encoding working with srt output.

6 years agolavf/srtenc: simplify timing printing.
Clément Bœsch [Sun, 21 Oct 2012 00:49:01 +0000 (02:49 +0200)]
lavf/srtenc: simplify timing printing.

6 years agosrt: make the demuxer output SubRip packets.
Clément Bœsch [Wed, 24 Oct 2012 22:01:42 +0000 (00:01 +0200)]
srt: make the demuxer output SubRip packets.

The SRT format should never have outputted CODEC_ID_SRT packets in the
first place: SRT is a subtitle format containing SubRip text markup
events. The timing information is part of the format, not the codec, and
thus CODEC_ID_SRT should not exist.

Creating packets with the timing information within the payload only
leads to problem (such as remuxing with timing alteration not working),
especially when the SubRip markup is being used in container like
Matroska in addition to this standalone SRT format.

The main reason the timing line was included in those CODEC_ID_SRT
packets is likely because it contained extra information (the event
position) the codec actually needs. This issue is solved by using the
AV_PKT_DATA_SUBTITLE_POSITION side data type.

6 years agolavc: add AV_PKT_DATA_SUBTITLE_POSITION side data type.
Clément Bœsch [Wed, 24 Oct 2012 21:58:15 +0000 (23:58 +0200)]
lavc: add AV_PKT_DATA_SUBTITLE_POSITION side data type.

This commit introduces a new packet side data type for the subtitle
position information. This is meant to be used by the SRT format where
that information is stored along with the timing, which is not part of
the subrip packets.

6 years agolavc/utils: make sub decode consistent with A/V.
Clément Bœsch [Sat, 20 Oct 2012 22:16:11 +0000 (00:16 +0200)]
lavc/utils: make sub decode consistent with A/V.

This allows side data to be transmitted properly with subtitles.

6 years agolavf/srtdec: simplify start/end computation.
Clément Bœsch [Sat, 20 Oct 2012 19:21:34 +0000 (21:21 +0200)]
lavf/srtdec: simplify start/end computation.

Also fix potential overflow (CID733778)

6 years agoffprobe: add an array of section print buffers to the WriterContext
Stefano Sabatini [Wed, 24 Oct 2012 10:06:21 +0000 (12:06 +0200)]
ffprobe: add an array of section print buffers to the WriterContext

Allow to factorize buffers initialization/release, for all the writers
which use it. Simplify.

6 years agoDoxyfile: update examples path and patterns
Stefano Sabatini [Wed, 24 Oct 2012 14:51:19 +0000 (16:51 +0200)]
Doxyfile: update examples path and patterns

6 years agodoc/texi2pod.pl: drop unnecessary rule, which was converting "\," to ","
Stefano Sabatini [Wed, 24 Oct 2012 14:39:32 +0000 (16:39 +0200)]
doc/texi2pod.pl: drop unnecessary rule, which was converting "\," to ","

I cannot find a reason for such a rule, which was resulting in badly
escaped filtergraph snippets.

Fix trac ticket #1610.

6 years agofourcc2pixfmt: fix compilation
Michael Niedermayer [Wed, 24 Oct 2012 20:19:46 +0000 (22:19 +0200)]
fourcc2pixfmt: fix compilation

If someone finds a cleaner fix, dont hesitate to revert this!

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavfilter: include needed header for AVDictionary
Michael Niedermayer [Wed, 24 Oct 2012 19:54:24 +0000 (21:54 +0200)]
libavfilter: include needed header for AVDictionary

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohttp: add -content_type user option.
Clément Bœsch [Tue, 23 Oct 2012 09:13:42 +0000 (11:13 +0200)]
http: add -content_type user option.

6 years agopgmyuvenc: do not create files which are not supported
Paul B Mahol [Wed, 24 Oct 2012 18:38:31 +0000 (18:38 +0000)]
pgmyuvenc: do not create files which are not supported

It is possible to support files with odd width and/or height
if real width and height are stored in header.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavf: const correctness for avformat_new_stream
Paul B Mahol [Wed, 24 Oct 2012 14:29:05 +0000 (14:29 +0000)]
lavf: const correctness for avformat_new_stream

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agomxfenc: Fix possible integer overflows
Tomas Härdin [Wed, 24 Oct 2012 15:06:49 +0000 (17:06 +0200)]
mxfenc: Fix possible integer overflows

None of these are likely unless the user is writing a file with two billion
streams or a duration of around two months.

This fixes CIDs 700568, 700569, 700570, 700571, 700572 and 700573.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomxfdec: Fix potential leak in mxf_read_local_tags()
Tomas Härdin [Wed, 24 Oct 2012 14:54:25 +0000 (16:54 +0200)]
mxfdec: Fix potential leak in mxf_read_local_tags()

This fixes CID 733800.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomxfdec: Fix a potential DoS vector in mxf_read_pixel_layout()
Tomas Härdin [Wed, 24 Oct 2012 14:51:41 +0000 (16:51 +0200)]
mxfdec: Fix a potential DoS vector in mxf_read_pixel_layout()

There's a a potential DoS problem in this function. Say an MXF file is
created with a PixelLayout with a long run of non-zeroes. Such a file could be
sent quickly (packed) over the net and would unpack quite fast. mxfdec would
then read it byte-by-byte, which would take considerable time.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomxfdec: Fix CID 732262
Tomas Härdin [Wed, 24 Oct 2012 14:50:26 +0000 (16:50 +0200)]
mxfdec: Fix CID 732262

Coverity thinks ofs can end up 15, thus writing past the end of layout[]. This
is incorrect since it's always incremented by 2. Checking ofs <= 14 makes
Coverity happy and doesn't hurt.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: detect parisc64 automatically
Mans Rullgard [Tue, 23 Oct 2012 23:21:15 +0000 (00:21 +0100)]
configure: detect parisc64 automatically

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoconfigure: detect ppc64 automatically
Mans Rullgard [Tue, 23 Oct 2012 22:39:40 +0000 (23:39 +0100)]
configure: detect ppc64 automatically

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoconfigure: detect mips64 automatically
Mans Rullgard [Tue, 23 Oct 2012 22:34:35 +0000 (23:34 +0100)]
configure: detect mips64 automatically

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoconfigure: generalise 64-bit test
Mans Rullgard [Tue, 23 Oct 2012 22:33:44 +0000 (23:33 +0100)]
configure: generalise 64-bit test

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agodoc/filters: escape special Texinfo character @ in overlay example
Stefano Sabatini [Wed, 24 Oct 2012 14:50:16 +0000 (16:50 +0200)]
doc/filters: escape special Texinfo character @ in overlay example

6 years agodoc/filters: remove unnecessary and inconsistent double ',' escaping
Stefano Sabatini [Wed, 24 Oct 2012 14:38:53 +0000 (16:38 +0200)]
doc/filters: remove unnecessary and inconsistent double ',' escaping

6 years agodoxygen: disable header/footer/stylesheet
Michael Niedermayer [Wed, 24 Oct 2012 14:47:10 +0000 (16:47 +0200)]
doxygen: disable header/footer/stylesheet

They dont work at all and trash the output totally
also they are unmaintained -> that is if you want to maintain them
contact us !

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavio: detect implicit truncation by assert in avio_w*
Michael Niedermayer [Mon, 15 Oct 2012 14:02:14 +0000 (16:02 +0200)]
avio: detect implicit truncation by assert in avio_w*

This check is somewhat more lenient as would be ideal because we dont
know if the input is signed or unsigned

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavio: avoid implicit truncation in avio_w*
Michael Niedermayer [Mon, 15 Oct 2012 14:01:55 +0000 (16:01 +0200)]
avio: avoid implicit truncation in avio_w*

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomatroskaenc: avoid implicit truncation in avio_w*
Michael Niedermayer [Mon, 15 Oct 2012 14:01:14 +0000 (16:01 +0200)]
matroskaenc: avoid implicit truncation in avio_w*

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 24 Oct 2012 12:26:13 +0000 (14:26 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  asfdec: cosmetics, reformat ff_asf_parse_packet()
  g.723.1: add missing CODEC_CAP_DR1
  avconv: remove now unneeded calls to avcodec_get_frame_defaults().
  lavc: initialize output AVFrame before decoding.

Conflicts:
libavformat/asfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c68317ebbe4915035df0b08c23eea7a0b80ab881'
Michael Niedermayer [Wed, 24 Oct 2012 12:18:17 +0000 (14:18 +0200)]
Merge commit 'c68317ebbe4915035df0b08c23eea7a0b80ab881'

* commit 'c68317ebbe4915035df0b08c23eea7a0b80ab881':
  lavc: fix documentation for AVCodecContext.delay
  atrac3: return an error if extradata_size is not a specific known size
  lavc: use the correct API version guard macro for avcodec_encode_audio()
  Move Doxyfile into the doc/ subdirectory
  doxygen: Build Doxygen documentation in the doc/ subdirectory
  dfa: use av_memcpy_backptr() where previously impossible
  av_memcpy_backptr: Drop no longer necessary malloc padding

Conflicts:
.gitignore
libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd82f188504410fdfa446c5682c128c31bb5851a4'
Michael Niedermayer [Wed, 24 Oct 2012 12:10:44 +0000 (14:10 +0200)]
Merge commit 'd82f188504410fdfa446c5682c128c31bb5851a4'

* commit 'd82f188504410fdfa446c5682c128c31bb5851a4':
  Remove need for padding in av_memcpy_backptr()

Conflicts:
libavutil/lzo.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ceb754d041f5f6327fd9195a5f43575af9516daa'
Michael Niedermayer [Wed, 24 Oct 2012 12:01:29 +0000 (14:01 +0200)]
Merge commit 'ceb754d041f5f6327fd9195a5f43575af9516daa'

* commit 'ceb754d041f5f6327fd9195a5f43575af9516daa':
  lzo: Use AV_COPY*U macros where appropriate
  prepare 9_beta2 release
  dsputil: Replace AV_WNxx(AV_RNxx()) combinations by AV_COPYxxU
  intreadwrite: Add AV_COPYxxU macros for copying to/from unaligned addresses
  dxtory: Replace AV_WN16A(AV_RN16A()) combination by AV_COPY16
  mp3: properly forward mp_decode_frame errors

Conflicts:
RELEASE
libavcodec/mpegaudiodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosmoothstreamingenc: Don't assume streams start from timestamp 0
Martin Storsjö [Tue, 23 Oct 2012 22:05:12 +0000 (01:05 +0300)]
smoothstreamingenc: Don't assume streams start from timestamp 0

Also use dts instead of pts for deciding where to split fragments.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMerge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'
Michael Niedermayer [Wed, 24 Oct 2012 11:31:46 +0000 (13:31 +0200)]
Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

* commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff':
  mp3: exit on parsing error in mp_decode_frame
  rtmppkt: Avoid unescaped backslash in Doxygen comment
  fate-lavfi: replace sed/grep/cut combos with awk
  build: Plan 9 support

Conflicts:
configure
tests/lavfi-regression.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobuild: fix detection of math functions with 2 parameters.
Michael Niedermayer [Wed, 24 Oct 2012 11:15:42 +0000 (13:15 +0200)]
build: fix detection of math functions with 2 parameters.

The code from libav seems to have been entirely untested.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '80521c1997a23e148edf89e11b939ab8646297ca'
Michael Niedermayer [Wed, 24 Oct 2012 10:53:26 +0000 (12:53 +0200)]
Merge commit '80521c1997a23e148edf89e11b939ab8646297ca'

* commit '80521c1997a23e148edf89e11b939ab8646297ca':
  build: allow targets to specify extra objects to link with executables
  swscale: avoid pointless use of compound literals
  libm: add fallbacks for various single-precision functions
  network: use getservbyport() only if available
  network: add fallbacks for INADDR_LOOPBACK and INET_ADDRSTRLEN
  Include sys/time.h before sys/resource.h

Conflicts:
Makefile
configure
libavutil/libm.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoasfdec: cosmetics, reformat ff_asf_parse_packet()
Anton Khirnov [Sat, 20 Oct 2012 15:15:57 +0000 (17:15 +0200)]
asfdec: cosmetics, reformat ff_asf_parse_packet()

6 years agog.723.1: add missing CODEC_CAP_DR1
Anton Khirnov [Wed, 17 Oct 2012 10:16:00 +0000 (12:16 +0200)]
g.723.1: add missing CODEC_CAP_DR1

6 years agoavconv: remove now unneeded calls to avcodec_get_frame_defaults().
Anton Khirnov [Tue, 23 Oct 2012 06:32:56 +0000 (08:32 +0200)]
avconv: remove now unneeded calls to avcodec_get_frame_defaults().

6 years agolavc: initialize output AVFrame before decoding.
Anton Khirnov [Tue, 23 Oct 2012 06:22:23 +0000 (08:22 +0200)]
lavc: initialize output AVFrame before decoding.

Avoids memleaks with audio when extended_data is nontrivial and the user
doesn't reset the frame.
Shouldn't have any effect for video for now, but might be useful in the
future.

6 years agoyuv2rgb: fix integer overflow in fill_gv_table()
Michael Niedermayer [Tue, 23 Oct 2012 23:24:26 +0000 (01:24 +0200)]
yuv2rgb: fix integer overflow in fill_gv_table()

Fixes CID703747
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoyuv2rgb: fix integer overflow in fill_table
Michael Niedermayer [Tue, 23 Oct 2012 23:22:56 +0000 (01:22 +0200)]
yuv2rgb: fix integer overflow in fill_table

Fixes CID703748
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswscale_unscaled: remove unused variables
Michael Niedermayer [Tue, 23 Oct 2012 23:09:14 +0000 (01:09 +0200)]
swscale_unscaled: remove unused variables

Fixes CID739472
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegvideo enc: choose VBV buffer size for mpeg4 when none is specified instead of...
Michael Niedermayer [Tue, 23 Oct 2012 22:38:56 +0000 (00:38 +0200)]
mpegvideo enc: choose VBV buffer size for mpeg4 when none is specified instead of failing

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegvideo enc: choose VBV buffer size for mpeg1/2 when none is specified instead...
Michael Niedermayer [Tue, 23 Oct 2012 22:03:06 +0000 (00:03 +0200)]
mpegvideo enc: choose VBV buffer size for mpeg1/2 when none is specified instead of failing

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoexamples/decoding_encoding: add and use the decode_write_frame function
Stefano Sabatini [Sat, 20 Oct 2012 09:26:05 +0000 (11:26 +0200)]
examples/decoding_encoding: add and use the decode_write_frame function

Allow to factorize code in video_decode_example(), simplify.

6 years agolavc/utils: fix a few grammar/style nits in log messages
Stefano Sabatini [Tue, 23 Oct 2012 21:34:38 +0000 (23:34 +0200)]
lavc/utils: fix a few grammar/style nits in log messages

In avcodec_open2(), apply consistent casing and avoid "or" conjunction at
the beginning of a sentence, in the messages issued in case of
experimental codec usage.

6 years agolavc/utils: propagate or return meaningful error codes in avcodec_open2()
Stefano Sabatini [Tue, 16 Oct 2012 11:30:52 +0000 (13:30 +0200)]
lavc/utils: propagate or return meaningful error codes in avcodec_open2()

6 years agoDo not detect mov with maximum score if the atom size is too small.
Carl Eugen Hoyos [Tue, 23 Oct 2012 20:41:15 +0000 (22:41 +0200)]
Do not detect mov with maximum score if the atom size is too small.

Fixes mpegts-in-mov, ticket #987 / issue 2223.

6 years agolavd/lavfi: add graph_file option
Stefano Sabatini [Mon, 22 Oct 2012 23:13:23 +0000 (01:13 +0200)]
lavd/lavfi: add graph_file option

Allow to specify a filename where to put the filtergraph description.

This is useful to override limitations or glitches of particular shell
environments, and allows a level of indirection for specifying
filtergraphs.

6 years agolavfi/sendcmd: move buf init() variable to internal scope where it is used
Stefano Sabatini [Tue, 23 Oct 2012 19:42:14 +0000 (21:42 +0200)]
lavfi/sendcmd: move buf init() variable to internal scope where it is used

6 years agolavfi/sendcmd: release file in case of failed allocation
Stefano Sabatini [Mon, 22 Oct 2012 23:42:24 +0000 (01:42 +0200)]
lavfi/sendcmd: release file in case of failed allocation

Avoid hanging file.