ffmpeg.git
6 years agoswr: use local variable for ns_errors
Michael Niedermayer [Sat, 12 Jan 2013 16:27:35 +0000 (17:27 +0100)]
swr: use local variable for ns_errors

71 -> 63 kcycles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr: minor simplification for the noise shaping pos update
Michael Niedermayer [Sat, 12 Jan 2013 16:25:19 +0000 (17:25 +0100)]
swr: minor simplification for the noise shaping pos update

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/aevalsrc: try to honor specified duration
Matthieu Bouron [Sat, 12 Jan 2013 13:32:03 +0000 (14:32 +0100)]
lavfi/aevalsrc: try to honor specified duration

If nb_samples divide sample_rate and if nb_samples allow it, aevalsrc
should generate the exact amount of samples according to duration.

Example:
aevalsrc=0::n=480:s=48000:d=5.21 should generate 250080 samples.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agofrmdec: do not abuse ff_codec_get_id()
Paul B Mahol [Tue, 8 Jan 2013 15:54:58 +0000 (15:54 +0000)]
frmdec: do not abuse ff_codec_get_id()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavf: use avpriv_find_pix_fmt instead of ff_
Michael Niedermayer [Sat, 12 Jan 2013 13:08:42 +0000 (14:08 +0100)]
lavf: use avpriv_find_pix_fmt instead of ff_

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc: ff_find_pix_fmt ->avpriv
Michael Niedermayer [Sat, 12 Jan 2013 13:06:30 +0000 (14:06 +0100)]
lavc: ff_find_pix_fmt ->avpriv

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 12 Jan 2013 12:42:42 +0000 (13:42 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Add version bump and APIchanges entry for Add AV_PIX_FMT_VDPAU.
  pixfmt: add picture format for VDPAU

Conflicts:
doc/APIchanges
libavutil/pixfmt.h
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f61272f0efd80da437570aad2c40e00f9d3f4fe6'
Michael Niedermayer [Sat, 12 Jan 2013 12:32:13 +0000 (13:32 +0100)]
Merge commit 'f61272f0efd80da437570aad2c40e00f9d3f4fe6'

* commit 'f61272f0efd80da437570aad2c40e00f9d3f4fe6':
  ratecontrol: K&R cosmetic formatting
  rtpdec: Remove a useless todo comment

Conflicts:
libavcodec/ratecontrol.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '54cb096ee4558b3bfc28c2fcd6418ce82dc39fe1'
Michael Niedermayer [Sat, 12 Jan 2013 12:14:00 +0000 (13:14 +0100)]
Merge commit '54cb096ee4558b3bfc28c2fcd6418ce82dc39fe1'

* commit '54cb096ee4558b3bfc28c2fcd6418ce82dc39fe1':
  rtsp: Remove an outdated comment
  rtsp: Remove references to weirdly named variables in other files

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c44784c9bb9d0ddf5d39d0dfa640816a57b8f457'
Michael Niedermayer [Sat, 12 Jan 2013 12:00:42 +0000 (13:00 +0100)]
Merge commit 'c44784c9bb9d0ddf5d39d0dfa640816a57b8f457'

* commit 'c44784c9bb9d0ddf5d39d0dfa640816a57b8f457':
  rtp: Rename a static variable to normal naming conventions
  rtp: Cosmetic cleanup

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdd version bump and APIchanges entry for Add AV_PIX_FMT_VDPAU.
Diego Biurrun [Sat, 12 Jan 2013 11:21:33 +0000 (12:21 +0100)]
Add version bump and APIchanges entry for Add AV_PIX_FMT_VDPAU.

Also fix a lavu version typo in APIchanges.

6 years agoratecontrol: K&R cosmetic formatting
Luca Barbato [Sat, 12 Jan 2013 05:16:53 +0000 (06:16 +0100)]
ratecontrol: K&R cosmetic formatting

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agopixfmt: add picture format for VDPAU
Rémi Denis-Courmont [Fri, 11 Jan 2013 21:27:58 +0000 (23:27 +0200)]
pixfmt: add picture format for VDPAU

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agodoc/protocols: improve wording of a sentence in http docs
Stefano Sabatini [Sat, 12 Jan 2013 10:01:12 +0000 (11:01 +0100)]
doc/protocols: improve wording of a sentence in http docs

Suggested-By: Alexander Strasser
6 years agodoc/ffserver: remove painfully outdated "What do I need?" section
Stefano Sabatini [Fri, 11 Jan 2013 11:54:45 +0000 (12:54 +0100)]
doc/ffserver: remove painfully outdated "What do I need?" section

6 years agodoc/ffserver: remove paragraph in the introductory blurb
Stefano Sabatini [Sat, 12 Jan 2013 09:49:46 +0000 (10:49 +0100)]
doc/ffserver: remove paragraph in the introductory blurb

The paragraph is about what ffserver is not and where to look for other
information, but is pretty redundant and distracting, especially
considering the new organization of the documentation.

6 years agodoc/ffserver: rework introducing paragraphs of the "description" chapter
Stefano Sabatini [Fri, 11 Jan 2013 11:53:18 +0000 (12:53 +0100)]
doc/ffserver: rework introducing paragraphs of the "description" chapter

In particular, add some markup, fix empty line, and merge it with "How
does it work?" section.

6 years agodoc/protocols: document http protocol options
Stefano Sabatini [Fri, 11 Jan 2013 10:51:26 +0000 (11:51 +0100)]
doc/protocols: document http protocol options

6 years agolavf/http: fix/extend option descriptions
Stefano Sabatini [Fri, 11 Jan 2013 10:35:31 +0000 (11:35 +0100)]
lavf/http: fix/extend option descriptions

In particular, favor predicative form over nominal description of the set
parameter. This is more globally consistent.

6 years agompegvideo: dont leave stale pointers in next/last picture
Michael Niedermayer [Sat, 12 Jan 2013 03:45:21 +0000 (04:45 +0100)]
mpegvideo: dont leave stale pointers in next/last picture

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovc1dec: ensure cbpcy_vlc has been set before decoding a frame.
Michael Niedermayer [Sat, 12 Jan 2013 02:40:54 +0000 (03:40 +0100)]
vc1dec: ensure cbpcy_vlc has been set before decoding a frame.

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: try to fix dirac
Michael Niedermayer [Fri, 11 Jan 2013 22:44:04 +0000 (23:44 +0100)]
fate: try to fix dirac

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: reset first_field when current_picture_ptr is reset
Michael Niedermayer [Fri, 11 Jan 2013 22:12:27 +0000 (23:12 +0100)]
h264: reset first_field when current_picture_ptr is reset

Fixes NULL pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortpdec: Remove a useless todo comment
Martin Storsjö [Fri, 11 Jan 2013 13:07:51 +0000 (15:07 +0200)]
rtpdec: Remove a useless todo comment

The question can be answered: No, we do not know the initial sequence
number from the SDP. In certain cases, it can be known from the
RTP-Info response header in RTSP though. (In that case, we use it as
timestamp origin, but not for rtp receiver statistics.)

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortsp: Remove an outdated comment
Martin Storsjö [Fri, 11 Jan 2013 12:53:58 +0000 (14:53 +0200)]
rtsp: Remove an outdated comment

It is unclear what the bug exactly was and if it ever was fixed,
and we don't even support decoding via faad any longer. The
comment has been present since d0deedcb in 2006.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortsp: Remove references to weirdly named variables in other files
Martin Storsjö [Fri, 11 Jan 2013 12:47:10 +0000 (14:47 +0200)]
rtsp: Remove references to weirdly named variables in other files

One of them is renamed now, but mentioning it by name serves
no purpose here.  The other table mentioned ceased to exist
under that name in 4934884a1 in 2006.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortp: Rename a static variable to normal naming conventions
Martin Storsjö [Fri, 11 Jan 2013 12:46:54 +0000 (14:46 +0200)]
rtp: Rename a static variable to normal naming conventions

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortp: Cosmetic cleanup
Martin Storsjö [Fri, 11 Jan 2013 12:44:40 +0000 (14:44 +0200)]
rtp: Cosmetic cleanup

Remove leftover debug comments, fix brace placement and
add whitespace, remove unnecessary and weirdly placed braces.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agofate: add dirac decoding test (main profile).
Clément Bœsch [Wed, 9 Jan 2013 00:00:24 +0000 (01:00 +0100)]
fate: add dirac decoding test (main profile).

6 years agomjpegdec: Fix out of array read in unescaping code
Michael Niedermayer [Fri, 11 Jan 2013 17:19:53 +0000 (18:19 +0100)]
mjpegdec: Fix out of array read in unescaping code

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomxfdec: Fix integer overflow with many channels
Michael Niedermayer [Tue, 8 Jan 2013 01:43:14 +0000 (02:43 +0100)]
mxfdec: Fix integer overflow with many channels

Fixes division by zero

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowavpack: check pointer to avoid overreading input buffer
Michael Niedermayer [Fri, 11 Jan 2013 15:36:52 +0000 (16:36 +0100)]
wavpack: check pointer to avoid overreading input buffer

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agora144enc: fix two "may be used uninitialized in this function" warnings
Michael Niedermayer [Fri, 11 Jan 2013 14:43:46 +0000 (15:43 +0100)]
ra144enc: fix two "may be used uninitialized in this function" warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoau: switch to ff_pcm_read_packet() again, after the merge
Michael Niedermayer [Fri, 11 Jan 2013 05:10:31 +0000 (06:10 +0100)]
au: switch to ff_pcm_read_packet() again, after the merge

This fixes G722 durations

Suggested-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 11 Jan 2013 12:37:38 +0000 (13:37 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: enable pic for shared libs on AArch64
  zmbv: Reset the decoder on keyframe errors

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7b8c5b263bc680eff5710bee5994de39d47fc15e'
Michael Niedermayer [Fri, 11 Jan 2013 11:43:45 +0000 (12:43 +0100)]
Merge commit '7b8c5b263bc680eff5710bee5994de39d47fc15e'

* commit '7b8c5b263bc680eff5710bee5994de39d47fc15e':
  vc1dec: prevent a crash due missing pred_flag parameter
  matroska: Fix use after free

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ec86ba57312745fd7ad9771e3121e79c6aacba30'
Michael Niedermayer [Fri, 11 Jan 2013 11:30:32 +0000 (12:30 +0100)]
Merge commit 'ec86ba57312745fd7ad9771e3121e79c6aacba30'

* commit 'ec86ba57312745fd7ad9771e3121e79c6aacba30':
  vp3: Fix double free in vp3_decode_end()
  fate: Split fate-siff test into demuxer and VB video decoder test

Conflicts:
tests/fate/demux.mak
tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: remove nonexistent symbols
Paul B Mahol [Fri, 11 Jan 2013 10:07:16 +0000 (10:07 +0000)]
lavf: remove nonexistent symbols

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoconfigure: enable pic for shared libs on AArch64
Marcin Juszkiewicz [Thu, 10 Jan 2013 12:22:53 +0000 (12:22 +0000)]
configure: enable pic for shared libs on AArch64

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agozmbv: Reset the decoder on keyframe errors
Luca Barbato [Fri, 11 Jan 2013 04:07:42 +0000 (05:07 +0100)]
zmbv: Reset the decoder on keyframe errors

Prevent the crash on fuzzed files as reported in bug 63.

6 years agovc1dec: prevent a crash due missing pred_flag parameter
Vladimir Pantelic [Wed, 9 Jan 2013 16:04:09 +0000 (17:04 +0100)]
vc1dec: prevent a crash due missing pred_flag parameter

Handle pred_flag parameter not given to get_mvdata_interlaced()

Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoerror_concealment: Check that the picture is not in a half setup state.
Michael Niedermayer [Fri, 11 Jan 2013 03:44:20 +0000 (04:44 +0100)]
error_concealment: Check that the picture is not in a half setup state.

Fixes state becoming inconsistent
Fixes a null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoass_split: fix out of array access in ass_split()
Michael Niedermayer [Fri, 11 Jan 2013 01:51:27 +0000 (02:51 +0100)]
ass_split: fix out of array access in ass_split()

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoass_split: fix out of array access
Michael Niedermayer [Fri, 11 Jan 2013 01:31:04 +0000 (02:31 +0100)]
ass_split: fix out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovorbisdec: Check bark_map_size.
Michael Niedermayer [Thu, 10 Jan 2013 23:54:12 +0000 (00:54 +0100)]
vorbisdec: Check bark_map_size.

This fixes potential divisions by zero and out of array accesses.

Reported-by: Dale Curtis <dalecurtis@chromium.org>
Found-by: inferno@chromium.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomatroska: Fix use after free
Dale Curtis [Thu, 10 Jan 2013 19:05:29 +0000 (11:05 -0800)]
matroska: Fix use after free

Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agolavfi/vf_overlay: check that filter_frame does not return EAGAIN.
Nicolas George [Thu, 10 Jan 2013 18:44:45 +0000 (19:44 +0100)]
lavfi/vf_overlay: check that filter_frame does not return EAGAIN.

EAGAIN is used internally in the code; it currently does not make
sense as a return code from the next filter.

Should fix CID966655.

6 years agoswr: check that allocation of in/out_convert succeeded
Michael Niedermayer [Thu, 10 Jan 2013 19:26:28 +0000 (20:26 +0100)]
swr: check that allocation of in/out_convert succeeded

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp3: Fix double free in vp3_decode_end()
Ronald Bultje [Thu, 10 Jan 2013 19:02:57 +0000 (11:02 -0800)]
vp3: Fix double free in vp3_decode_end()

Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoswr: Use a temporary buffer for dither/Noise shaping when the input is read only
Michael Niedermayer [Thu, 10 Jan 2013 17:51:30 +0000 (18:51 +0100)]
swr: Use a temporary buffer for dither/Noise shaping when the input is read only

This avoids copying the input

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr: mark noise data for noise shaping as const
Michael Niedermayer [Thu, 10 Jan 2013 17:07:32 +0000 (18:07 +0100)]
swr: mark noise data for noise shaping as const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr: add seperate in/out pointers to the noise shaping code
Michael Niedermayer [Thu, 10 Jan 2013 17:06:19 +0000 (18:06 +0100)]
swr: add seperate in/out pointers to the noise shaping code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr: rename dither_pos to noise_pos
Michael Niedermayer [Thu, 10 Jan 2013 17:01:26 +0000 (18:01 +0100)]
swr: rename dither_pos to noise_pos

THis more closely matches what the field represents

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: Split fate-siff test into demuxer and VB video decoder test
Diego Biurrun [Sat, 1 Dec 2012 15:11:22 +0000 (16:11 +0100)]
fate: Split fate-siff test into demuxer and VB video decoder test

6 years agoidcin: fix memleak
Michael Niedermayer [Thu, 10 Jan 2013 16:26:03 +0000 (17:26 +0100)]
idcin: fix memleak

Found-by: valgrind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 10 Jan 2013 12:07:19 +0000 (13:07 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtpdec_vp8: Don't trim too much data from broken frames
  rtpdec_vp8: Simplify code by using an existing helper function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoDo not allow arbitrary packet size in aac decoder.
Carl Eugen Hoyos [Thu, 10 Jan 2013 12:00:19 +0000 (13:00 +0100)]
Do not allow arbitrary packet size in aac decoder.

Fixes a crash with a file containing a 400MB packet reported in bug 420.

6 years agoMerge commit 'ed79093222ceb42f0c3a39095a69af0b32be5450'
Michael Niedermayer [Thu, 10 Jan 2013 11:56:58 +0000 (12:56 +0100)]
Merge commit 'ed79093222ceb42f0c3a39095a69af0b32be5450'

* commit 'ed79093222ceb42f0c3a39095a69af0b32be5450':
  rtpdec: Add a terminating null byte at the end of the SDES/CNAME
  yuv4mpeg: do not use deprecated functions
  oggdec: fix faulty cleanup prototype
  idcin: return 0 from idcin_read_packet() on success.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5d0450461ff729be5f531d333d29754155e406c5'
Michael Niedermayer [Thu, 10 Jan 2013 11:52:02 +0000 (12:52 +0100)]
Merge commit '5d0450461ff729be5f531d333d29754155e406c5'

* commit '5d0450461ff729be5f531d333d29754155e406c5':
  idcin: better error handling
  idcin: check for integer overflow when calling av_get_packet()

Conflicts:
libavformat/idcin.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7040e479a1530b2eda4b89a182d5eb50a77bd907'
Michael Niedermayer [Thu, 10 Jan 2013 11:45:42 +0000 (12:45 +0100)]
Merge commit '7040e479a1530b2eda4b89a182d5eb50a77bd907'

* commit '7040e479a1530b2eda4b89a182d5eb50a77bd907':
  idcin: allow seeking back to the first packet
  idcin: set AV_PKT_FLAG_KEY for video packets with a palette

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ccc0ffb1ba3fc1adb05a9f56dfc26131e61db3fb'
Michael Niedermayer [Thu, 10 Jan 2013 11:40:38 +0000 (12:40 +0100)]
Merge commit 'ccc0ffb1ba3fc1adb05a9f56dfc26131e61db3fb'

* commit 'ccc0ffb1ba3fc1adb05a9f56dfc26131e61db3fb':
  idcin: set start_time and packet duration instead of manually tracking pts.
  idcin: set channel_layout

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '12c2530b1d87fa94f81ea97df575b77c825e6f4f'
Michael Niedermayer [Thu, 10 Jan 2013 11:33:45 +0000 (12:33 +0100)]
Merge commit '12c2530b1d87fa94f81ea97df575b77c825e6f4f'

* commit '12c2530b1d87fa94f81ea97df575b77c825e6f4f':
  idcin: fix check for presence of an audio stream
  idcin: validate header parameters

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f7bf72a4a1146a7583577c9bdc066767e1ba3c6a'
Michael Niedermayer [Thu, 10 Jan 2013 11:26:28 +0000 (12:26 +0100)]
Merge commit 'f7bf72a4a1146a7583577c9bdc066767e1ba3c6a'

* commit 'f7bf72a4a1146a7583577c9bdc066767e1ba3c6a':
  idcinvideo: correctly set AVFrame defaults
  yadif: Port inline assembly to yasm
  au: remove unnecessary casts
  au: return AVERROR codes instead of -1

Conflicts:
libavcodec/idcinvideo.c
libavfilter/x86/yadif_template.c
libavformat/au.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'fd9147f11456a7e39a998d7270684922a2a46e6d'
Michael Niedermayer [Thu, 10 Jan 2013 11:15:21 +0000 (12:15 +0100)]
Merge commit 'fd9147f11456a7e39a998d7270684922a2a46e6d'

* commit 'fd9147f11456a7e39a998d7270684922a2a46e6d':
  au: cosmetics: pretty-print and remove pointless comments

Conflicts:
libavformat/au.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c88d245c9866e48cb8a238b7564964c1fcf3315f'
Michael Niedermayer [Thu, 10 Jan 2013 11:02:58 +0000 (12:02 +0100)]
Merge commit 'c88d245c9866e48cb8a238b7564964c1fcf3315f'

* commit 'c88d245c9866e48cb8a238b7564964c1fcf3315f':
  au: use ff_raw_write_packet()
  au: set stream start time and packet durations

Conflicts:
libavformat/au.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'af68a2baae6761044cbed95575e8bcfebf55c6f1'
Michael Niedermayer [Thu, 10 Jan 2013 10:20:58 +0000 (11:20 +0100)]
Merge commit 'af68a2baae6761044cbed95575e8bcfebf55c6f1'

* commit 'af68a2baae6761044cbed95575e8bcfebf55c6f1':
  au: use %u when printing id and channels since they are unsigned
  au: validate sample rate

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c837b38dd33a11c3810e988a60193a858eb4f58c'
Michael Niedermayer [Thu, 10 Jan 2013 10:12:08 +0000 (11:12 +0100)]
Merge commit 'c837b38dd33a11c3810e988a60193a858eb4f58c'

* commit 'c837b38dd33a11c3810e988a60193a858eb4f58c':
  au: move skipping of unused data to before parameter validation
  au: do not arbitrarily limit channel count

Conflicts:
libavformat/au.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/yadif: fix shorthand/option mismatch
André Pankratz [Thu, 10 Jan 2013 09:37:49 +0000 (10:37 +0100)]
lavfi/yadif: fix shorthand/option mismatch

Fix trac ticket #2128.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agoMerge commit '2613de88051818abafccb98646394341887acb3a'
Michael Niedermayer [Thu, 10 Jan 2013 09:42:34 +0000 (10:42 +0100)]
Merge commit '2613de88051818abafccb98646394341887acb3a'

We dont use au_read_packet() anymore and block_align is already set.
Thus nothing had to be merged from these.

* commit '2613de88051818abafccb98646394341887acb3a':
  au: do not set pkt->size directly
  au: set block_align and use it in au_read_packet()

Conflicts:
libavformat/au.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9a7b56883d1333cdfcdf0fa7584a333841b86114'
Michael Niedermayer [Thu, 10 Jan 2013 09:18:35 +0000 (10:18 +0100)]
Merge commit '9a7b56883d1333cdfcdf0fa7584a333841b86114'

* commit '9a7b56883d1333cdfcdf0fa7584a333841b86114':
  au: set bit rate
  au: validate bits-per-sample separately from codec tag
  rtpdec_vp8: Mark broken packets with AV_PKT_FLAG_CORRUPT

Conflicts:
libavformat/au.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFix compilation with --disable-everything.
Carl Eugen Hoyos [Thu, 10 Jan 2013 09:04:46 +0000 (10:04 +0100)]
Fix compilation with --disable-everything.

6 years agortpdec_vp8: Don't trim too much data from broken frames
Martin Storsjö [Wed, 9 Jan 2013 12:25:59 +0000 (14:25 +0200)]
rtpdec_vp8: Don't trim too much data from broken frames

Previously, for broken frames, we only returned the first partition
of the frame (we would append all the received packets to the packet
buffer, then set pkt->size to the size of the first partition, since
the rest of the frame could have lost data inbetween) - now instead
return the full buffered data we have, but don't append anything more
to the buffer after the lost packet discontinuity. Decoding the
truncated packet should hopefully get better quality than trimming out
everything after the first partition.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortpdec_vp8: Simplify code by using an existing helper function
Martin Storsjö [Wed, 9 Jan 2013 12:25:22 +0000 (14:25 +0200)]
rtpdec_vp8: Simplify code by using an existing helper function

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortpdec: Add a terminating null byte at the end of the SDES/CNAME
Martin Storsjö [Wed, 9 Jan 2013 17:41:21 +0000 (19:41 +0200)]
rtpdec: Add a terminating null byte at the end of the SDES/CNAME

This is required by RFC 3550 (section 6.5):

   The list of items in each chunk MUST be terminated by one or more
   null octets, the first of which is interpreted as an item type of
   zero to denote the end of the list.

This was implicitly added as padding before, unless the host name
length matched up so no padding was added.

This makes wireshark parse the packets properly if other RTCP items
are appended to the same packet.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agowmalosslessdec: make arrays indexed by ch large enough for maximum number of channels
Michael Niedermayer [Thu, 10 Jan 2013 03:50:33 +0000 (04:50 +0100)]
wmalosslessdec: make arrays indexed by ch large enough for maximum number of channels

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotarga: use checked bytestream read
Michael Niedermayer [Thu, 10 Jan 2013 03:37:45 +0000 (04:37 +0100)]
targa: use checked bytestream read

Fix out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoqdm2: fix out of stack array read.
Michael Niedermayer [Thu, 10 Jan 2013 03:23:14 +0000 (04:23 +0100)]
qdm2: fix out of stack array read.

The read value is not used when its outside the array.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr: scale data down in noise shaping to avoid cliping
Michael Niedermayer [Thu, 10 Jan 2013 00:28:24 +0000 (01:28 +0100)]
swr: scale data down in noise shaping to avoid cliping

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr: reorder the operations in the noise shaping code
Michael Niedermayer [Wed, 9 Jan 2013 23:27:04 +0000 (00:27 +0100)]
swr: reorder the operations in the noise shaping code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr: add noise_scale field to seperate it from the noise shaping scales
Michael Niedermayer [Wed, 9 Jan 2013 23:25:09 +0000 (00:25 +0100)]
swr: add noise_scale field to seperate it from the noise shaping scales

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr: fix the noise sample type for noise shaping
Michael Niedermayer [Wed, 9 Jan 2013 22:20:24 +0000 (23:20 +0100)]
swr: fix the noise sample type for noise shaping

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr: split swri_dither_init() out
Michael Niedermayer [Wed, 9 Jan 2013 21:46:32 +0000 (22:46 +0100)]
swr: split swri_dither_init() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc: add noise shaping dithers
Michael Niedermayer [Wed, 9 Jan 2013 19:12:50 +0000 (20:12 +0100)]
doc: add noise shaping dithers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdd -movflags rtphint documentation.
Carl Eugen Hoyos [Wed, 9 Jan 2013 22:13:40 +0000 (23:13 +0100)]
Add -movflags rtphint documentation.

6 years agoyuv4mpeg: do not use deprecated functions
Luca Barbato [Wed, 9 Jan 2013 19:50:06 +0000 (20:50 +0100)]
yuv4mpeg: do not use deprecated functions

Use the libavutil replacement.

6 years agooggdec: fix faulty cleanup prototype
Luca Barbato [Wed, 9 Jan 2013 19:49:34 +0000 (20:49 +0100)]
oggdec: fix faulty cleanup prototype

6 years agoidcin: better error handling
Justin Ruggles [Wed, 1 Aug 2012 21:16:58 +0000 (17:16 -0400)]
idcin: better error handling

Add some additional checks for EOF and print error messages on an incomplete
header or packet.

FATE reference updated for id-cin-video due to the demuxer no longer
returning a partial video packet at EOF.

6 years agoidcin: return 0 from idcin_read_packet() on success.
Justin Ruggles [Wed, 1 Aug 2012 20:13:04 +0000 (16:13 -0400)]
idcin: return 0 from idcin_read_packet() on success.

This matches the AVInputFormat.read_packet() API.

6 years agoidcin: allow seeking back to the first packet
Justin Ruggles [Wed, 1 Aug 2012 21:14:39 +0000 (17:14 -0400)]
idcin: allow seeking back to the first packet

Also, do not allow seek-by-byte, as there is no way to find the next packet
boundary.

6 years agoidcin: set start_time and packet duration instead of manually tracking pts.
Justin Ruggles [Wed, 1 Aug 2012 20:06:23 +0000 (16:06 -0400)]
idcin: set start_time and packet duration instead of manually tracking pts.

Also, use 1 / sample_rate for audio stream time_base.

6 years agoidcin: fix check for presence of an audio stream
Justin Ruggles [Wed, 1 Aug 2012 19:57:31 +0000 (15:57 -0400)]
idcin: fix check for presence of an audio stream

6 years agoidcinvideo: correctly set AVFrame defaults
Justin Ruggles [Wed, 1 Aug 2012 19:46:08 +0000 (15:46 -0400)]
idcinvideo: correctly set AVFrame defaults

6 years agoidcin: check for integer overflow when calling av_get_packet()
Justin Ruggles [Wed, 1 Aug 2012 20:10:08 +0000 (16:10 -0400)]
idcin: check for integer overflow when calling av_get_packet()

chunk_size is unsigned 32-bit, but av_get_packet() takes a signed int as the
packet size.

6 years agoidcin: set AV_PKT_FLAG_KEY for video packets with a palette
Justin Ruggles [Wed, 1 Aug 2012 20:08:28 +0000 (16:08 -0400)]
idcin: set AV_PKT_FLAG_KEY for video packets with a palette

6 years agoidcin: set channel_layout
Justin Ruggles [Wed, 1 Aug 2012 19:59:12 +0000 (15:59 -0400)]
idcin: set channel_layout

6 years agoidcin: validate header parameters
Justin Ruggles [Wed, 1 Aug 2012 19:53:20 +0000 (15:53 -0400)]
idcin: validate header parameters

Avoids using unsupported parameters and signed integer overflows.

6 years agoswr: remove unused variable
Michael Niedermayer [Wed, 9 Jan 2013 17:41:40 +0000 (18:41 +0100)]
swr: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr: move dither related fields to their own context
Michael Niedermayer [Wed, 9 Jan 2013 17:41:12 +0000 (18:41 +0100)]
swr: move dither related fields to their own context

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoyadif: Port inline assembly to yasm
Daniel Kang [Wed, 9 Jan 2013 15:34:46 +0000 (09:34 -0600)]
yadif: Port inline assembly to yasm

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoswr: update copyright years of a few files iam working on
Michael Niedermayer [Wed, 9 Jan 2013 17:30:01 +0000 (18:30 +0100)]
swr: update copyright years of a few files iam working on

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>