ffmpeg.git
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 20 Jun 2013 08:29:05 +0000 (10:29 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Remove unneeded icl inline compatibility definition

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoDocument "crypto" protocol
Andrey Utkin [Wed, 19 Jun 2013 05:17:58 +0000 (08:17 +0300)]
Document "crypto" protocol

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/decoders: Document libgsm decoder
Timothy Gu [Tue, 18 Jun 2013 23:01:43 +0000 (16:01 -0700)]
doc/decoders: Document libgsm decoder

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Wed, 19 Jun 2013 20:13:29 +0000 (22:13 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Autodetect idcin only if audio properties allow decoding.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodelogo: Fix function description
Jean Delvare [Wed, 19 Jun 2013 14:07:09 +0000 (16:07 +0200)]
delogo: Fix function description

The algorithm works on src and writes to dst, not the other way
around.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoAutodetect idcin only if audio properties allow decoding.
Carl Eugen Hoyos [Wed, 19 Jun 2013 14:31:10 +0000 (16:31 +0200)]
Autodetect idcin only if audio properties allow decoding.

Fixes ticket #2688.

7 years agoisom: add xd51 hdcam , someone needs to binary search FCP for new isom...
Compn [Wed, 19 Jun 2013 14:43:48 +0000 (10:43 -0400)]
isom: add xd51 hdcam , someone needs to binary search FCP for new isom...

7 years agosonicenc: fix off by 1 error
Michael Niedermayer [Wed, 19 Jun 2013 08:06:38 +0000 (10:06 +0200)]
sonicenc: fix off by 1 error

Fixes out of array accesses

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosonicenc: dont put multiple assignments per line
Michael Niedermayer [Wed, 19 Jun 2013 08:06:10 +0000 (10:06 +0200)]
sonicenc: dont put multiple assignments per line

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: Remove unneeded icl inline compatibility definition
Alex Smith [Wed, 19 Jun 2013 00:39:47 +0000 (20:39 -0400)]
configure: Remove unneeded icl inline compatibility definition

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agosonicenc: set supported samples formats array
Michael Niedermayer [Wed, 19 Jun 2013 07:50:01 +0000 (09:50 +0200)]
sonicenc: set supported samples formats array

This ensures that only supported formats are input

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 19 Jun 2013 06:27:35 +0000 (08:27 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavfi: switch ff_default_get_audio_buffer() to av_frame_get_buffer()

Conflicts:
libavfilter/audio.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/encoders: Add libopencore-amrnb doc
Timothy Gu [Tue, 18 Jun 2013 00:38:38 +0000 (17:38 -0700)]
doc/encoders: Add libopencore-amrnb doc

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge branch 'frame_num_offset' of https://github.com/mjmvisser/FFmpeg
Michael Niedermayer [Tue, 18 Jun 2013 23:25:32 +0000 (01:25 +0200)]
Merge branch 'frame_num_offset' of https://github.com/mjmvisser/FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoadd the start_number offset to var_values[VAR_N] directly, instead of adding it in...
Mark Visser [Tue, 18 Jun 2013 21:38:17 +0000 (17:38 -0400)]
add the start_number offset to var_values[VAR_N] directly, instead of adding it in func_frame_num

7 years agoff_gen_search: fix infinite loop
Michael Niedermayer [Tue, 18 Jun 2013 18:50:15 +0000 (20:50 +0200)]
ff_gen_search: fix infinite loop

Fixes Ticket2639

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoff_gen_search: fix limit
Michael Niedermayer [Tue, 18 Jun 2013 18:48:53 +0000 (20:48 +0200)]
ff_gen_search: fix limit

The limit value could become slightly wrong in the last iteration

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoff_gen_search: make step 64it to prevent hypothetical integer overflow
Michael Niedermayer [Tue, 18 Jun 2013 18:47:07 +0000 (20:47 +0200)]
ff_gen_search: make step 64it to prevent hypothetical integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/decoders: Document libcelt
Timothy Gu [Tue, 18 Jun 2013 00:42:08 +0000 (17:42 -0700)]
doc/decoders: Document libcelt

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoAdd maintainer for WebVTT demuxer and muxer
Matthew Heaney [Mon, 17 Jun 2013 23:29:13 +0000 (16:29 -0700)]
Add maintainer for WebVTT demuxer and muxer

Matthew J Heaney is added to the list of ffmpeg maintainers, for the
WebVTT demuxer and muxer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavutil/frame: Try to align width to achive linesize[0] alignment
Michael Niedermayer [Tue, 18 Jun 2013 14:39:23 +0000 (16:39 +0200)]
avutil/frame: Try to align width to achive linesize[0] alignment

This results in more alignment for pixel formats that have "odd" pixel
sizes like RGB24. It makes access through SIMD easier

Works around Issue described in Ticket1031

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi: switch ff_default_get_audio_buffer() to av_frame_get_buffer()
Anton Khirnov [Wed, 29 May 2013 19:03:20 +0000 (21:03 +0200)]
lavfi: switch ff_default_get_audio_buffer() to av_frame_get_buffer()

This simplifies the code and avoids using libavcodec-specific
avcodec_fill_audio_frame().

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 18 Jun 2013 07:29:35 +0000 (09:29 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavfi: math typo in interlace filter

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswresample/x86/audio_convert: add emms to CONV
Michael Niedermayer [Tue, 18 Jun 2013 00:09:46 +0000 (02:09 +0200)]
swresample/x86/audio_convert: add emms to CONV

Might fix Ticket1874

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovaapi: return early from ff_vaapi_render_picture() without picture
Janne Grunau [Mon, 17 Jun 2013 23:56:06 +0000 (01:56 +0200)]
vaapi: return early from ff_vaapi_render_picture() without picture

Fixes an assertion when called on uninitialized frame. Spotted after
seeking in vlc.
Fixes ticket #2461.

Tested-by: Timo
Reviewed-by: Joakim Plate
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
7 years agoRevert "vaapi: return early from ff_vaapi_render_picture() without picture"
Carl Eugen Hoyos [Mon, 17 Jun 2013 23:54:30 +0000 (01:54 +0200)]
Revert "vaapi: return early from ff_vaapi_render_picture() without picture"

This reverts commit 4cbf245f2a2cd2170ca30b0788c2af5b506fe6d6.

I messed up the author information.

7 years agovaapi: return early from ff_vaapi_render_picture() without picture
Carl Eugen Hoyos [Mon, 17 Jun 2013 22:21:09 +0000 (00:21 +0200)]
vaapi: return early from ff_vaapi_render_picture() without picture

Fixes an assertion when called on uninitialized frame. Spotted after
seeking in vlc.
Fixes ticket #2461.

Tested-by: Timo
Reviewed-by: Joakim Plate
7 years agolavfi/src_movie: Use movie_common_init instead individual wrappers
Alexander Strasser [Sun, 16 Jun 2013 19:44:02 +0000 (21:44 +0200)]
lavfi/src_movie: Use movie_common_init instead individual wrappers

Makes it easier to understand that there is no difference in init
callback for movie and amovie. Also saves a few lines of code.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
7 years agolavfi/src_movie: Check pointer is not NULL before deref
Alexander Strasser [Sun, 16 Jun 2013 18:31:08 +0000 (20:31 +0200)]
lavfi/src_movie: Check pointer is not NULL before deref

Also do not check against empty string, the lower levels should
be able to deal with it.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
7 years agolavf: add WebVTT muxer.
Matthew Heaney [Wed, 12 Jun 2013 19:46:16 +0000 (12:46 -0700)]
lavf: add WebVTT muxer.

This revision creates a WebVTT muxer, that outputs files having the
format described in the following specification:

http://dev.w3.org/html5/webvtt/

7 years agommsh: dont close context on seeking failure
Michael Niedermayer [Mon, 17 Jun 2013 20:03:36 +0000 (22:03 +0200)]
mmsh: dont close context on seeking failure

Fixes Ticket2581

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agommsh/mmsh_close: use ffurl_closep()
Michael Niedermayer [Mon, 17 Jun 2013 19:34:52 +0000 (21:34 +0200)]
mmsh/mmsh_close: use ffurl_closep()

avoid using freed pointers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agommsh/mmsh_close: use av_freep()
Michael Niedermayer [Mon, 17 Jun 2013 19:31:07 +0000 (21:31 +0200)]
mmsh/mmsh_close: use av_freep()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agojpeg2000dec: make cblk->length(inc)/data use consistent
Michael Niedermayer [Thu, 13 Jun 2013 01:17:19 +0000 (03:17 +0200)]
jpeg2000dec: make cblk->length(inc)/data use consistent

Fixes Ticket2612

Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/http: remove Mozilla/5.0 from user agent.
Clément Bœsch [Mon, 17 Jun 2013 15:03:15 +0000 (17:03 +0200)]
lavf/http: remove Mozilla/5.0 from user agent.

It is notably known to break playback on http streaming servers who use
the user agent to guess if it's a browser (to display a summary) or a
player (to stream the audio data).

This reverts 1fabd95.

Fixes Ticket #2663.

7 years agolavfi: math typo in interlace filter
Vittorio Giovara [Mon, 17 Jun 2013 09:54:26 +0000 (11:54 +0200)]
lavfi: math typo in interlace filter

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agoffplay: remove remains of the old audio and video clock VideoState variables
Marton Balint [Sat, 15 Jun 2013 16:40:44 +0000 (18:40 +0200)]
ffplay: remove remains of the old audio and video clock VideoState variables

The unified clock state holds this information now.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: fix missed conversion of video_current_pts to vidclk.pts in subtitles
Marton Balint [Sat, 15 Jun 2013 16:26:22 +0000 (18:26 +0200)]
ffplay: fix missed conversion of video_current_pts to vidclk.pts in subtitles

Fixes regression with subtitles introduced in f2175a6.
Fixes ticket #2666.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: cast vp->height to int64 in buffer size check
Marton Balint [Tue, 4 Jun 2013 21:23:09 +0000 (23:23 +0200)]
ffplay: cast vp->height to int64 in buffer size check

Fixes Coverity CID 1026769 and 1026756.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 16 Jun 2013 23:04:33 +0000 (01:04 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  smacker: check frame size validity

Conflicts:
libavformat/smacker.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '58c95448e42d34910b939363949ba1a92c06b0b0'
Michael Niedermayer [Sun, 16 Jun 2013 22:44:32 +0000 (00:44 +0200)]
Merge commit '58c95448e42d34910b939363949ba1a92c06b0b0'

* commit '58c95448e42d34910b939363949ba1a92c06b0b0':
  smacker: pad the extradata allocation

Conflicts:
libavformat/smacker.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'bbb2945f2dfbc2306c1655bf7eb6e220912a9a7c'
Michael Niedermayer [Sun, 16 Jun 2013 22:36:25 +0000 (00:36 +0200)]
Merge commit 'bbb2945f2dfbc2306c1655bf7eb6e220912a9a7c'

* commit 'bbb2945f2dfbc2306c1655bf7eb6e220912a9a7c':
  smacker: check the return value of smacker_decode_tree

Conflicts:
libavcodec/smacker.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'f52edef30197735bfb937e9e723ab1e7b31165c6'
Michael Niedermayer [Sun, 16 Jun 2013 22:27:48 +0000 (00:27 +0200)]
Merge commit 'f52edef30197735bfb937e9e723ab1e7b31165c6'

* commit 'f52edef30197735bfb937e9e723ab1e7b31165c6':
  smacker: fix an off by one in huff.length computation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '985f34b75653d02eda8eb8def3412f8577f19b01'
Michael Niedermayer [Sun, 16 Jun 2013 22:21:22 +0000 (00:21 +0200)]
Merge commit '985f34b75653d02eda8eb8def3412f8577f19b01'

* commit '985f34b75653d02eda8eb8def3412f8577f19b01':
  utils: fix avcodec_flush_buffers pre-reference counting compatibility

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef'
Michael Niedermayer [Sun, 16 Jun 2013 22:05:02 +0000 (00:05 +0200)]
Merge commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef'

* commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef':
  avf: move url utility functions in a separate file

Conflicts:
libavformat/internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '12db891dcd57b305d6e3c1e22ea8204dc26edda1'
Michael Niedermayer [Sun, 16 Jun 2013 21:58:59 +0000 (23:58 +0200)]
Merge commit '12db891dcd57b305d6e3c1e22ea8204dc26edda1'

* commit '12db891dcd57b305d6e3c1e22ea8204dc26edda1':
  avf: move ff_write_chained to mux.c

Conflicts:
libavformat/mux.c
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '508998f7d5cc61c7ac7b049813b47adc24c6e282'
Michael Niedermayer [Sun, 16 Jun 2013 21:52:08 +0000 (23:52 +0200)]
Merge commit '508998f7d5cc61c7ac7b049813b47adc24c6e282'

* commit '508998f7d5cc61c7ac7b049813b47adc24c6e282':
  avf: move riff tags accessors where they belong

Conflicts:
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c'
Michael Niedermayer [Sun, 16 Jun 2013 21:45:42 +0000 (23:45 +0200)]
Merge commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c'

* commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c':
  avf: move ff_http_match_no_proxy to network

Conflicts:
libavformat/internal.h
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'afc8685395e775fe0f2a1698b683aea4afd124af'
Michael Niedermayer [Sun, 16 Jun 2013 21:38:27 +0000 (23:38 +0200)]
Merge commit 'afc8685395e775fe0f2a1698b683aea4afd124af'

* commit 'afc8685395e775fe0f2a1698b683aea4afd124af':
  avf: split off format register and lookup function

Conflicts:
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'f80b60ad59945dae32bb26a4e239ed94b0e92fa3'
Michael Niedermayer [Sun, 16 Jun 2013 21:29:37 +0000 (23:29 +0200)]
Merge commit 'f80b60ad59945dae32bb26a4e239ed94b0e92fa3'

* commit 'f80b60ad59945dae32bb26a4e239ed94b0e92fa3':
  bitstream: forward error values and drop few abort()

Conflicts:
libavcodec/bitstream.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'f776899a17dce32ad7fb9231d98f15558f37cc3f'
Michael Niedermayer [Sun, 16 Jun 2013 21:18:57 +0000 (23:18 +0200)]
Merge commit 'f776899a17dce32ad7fb9231d98f15558f37cc3f'

* commit 'f776899a17dce32ad7fb9231d98f15558f37cc3f':
  bitstream: K&R formatting cosmetics

Conflicts:
libavcodec/bitstream.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '9e80eda26d06c7c48dbec5dfe643c857c62c0ee7'
Michael Niedermayer [Sun, 16 Jun 2013 20:59:59 +0000 (22:59 +0200)]
Merge commit '9e80eda26d06c7c48dbec5dfe643c857c62c0ee7'

* commit '9e80eda26d06c7c48dbec5dfe643c857c62c0ee7':
  h264_mp4toannexb_bsf: return a padded buffer

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '8d929afd256069aa881f2bf58ef9f0ffce2d6b7e'
Michael Niedermayer [Sun, 16 Jun 2013 20:51:56 +0000 (22:51 +0200)]
Merge commit '8d929afd256069aa881f2bf58ef9f0ffce2d6b7e'

* commit '8d929afd256069aa881f2bf58ef9f0ffce2d6b7e':
  h264_mp4toannexb_bsf: factor out extradata parsing

Conflicts:
libavcodec/h264_mp4toannexb_bsf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '5d21ca45591bb1c1d2265f8ed972d18c563f145e'
Michael Niedermayer [Sun, 16 Jun 2013 20:40:43 +0000 (22:40 +0200)]
Merge commit '5d21ca45591bb1c1d2265f8ed972d18c563f145e'

* commit '5d21ca45591bb1c1d2265f8ed972d18c563f145e':
  h264_mp4toannexb_bsf: K&R formatting cosmetics

Conflicts:
libavcodec/h264_mp4toannexb_bsf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf: show APIC for tta files too
Paul B Mahol [Sun, 16 Jun 2013 18:49:51 +0000 (18:49 +0000)]
lavf: show APIC for tta files too

Fixes #2676.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agotta: read ape tags last
Paul B Mahol [Sun, 16 Jun 2013 18:46:35 +0000 (18:46 +0000)]
tta: read ape tags last

Otherwise, cover art will create video stream with index 0.
Fixes #2677.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agopostprocess_template: put rsp on the clobber list to prevent gcc from using it in "q"
Michael Niedermayer [Sun, 16 Jun 2013 16:19:30 +0000 (18:19 +0200)]
postprocess_template: put rsp on the clobber list to prevent gcc from using it in "q"

Fixes Ticket2675

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosmacker: check frame size validity
Kostya Shishkov [Wed, 12 Jun 2013 12:30:51 +0000 (14:30 +0200)]
smacker: check frame size validity

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agosmacker: pad the extradata allocation
Kostya Shishkov [Wed, 12 Jun 2013 12:28:07 +0000 (14:28 +0200)]
smacker: pad the extradata allocation

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agosmacker: check the return value of smacker_decode_tree
Kostya Shishkov [Wed, 12 Jun 2013 12:27:00 +0000 (14:27 +0200)]
smacker: check the return value of smacker_decode_tree

Also prevent a memory leak.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agosmacker: fix an off by one in huff.length computation
Kostya Shishkov [Wed, 12 Jun 2013 12:22:24 +0000 (14:22 +0200)]
smacker: fix an off by one in huff.length computation

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agoavcodec/jpeg2000dec: move bpno check to a earlier place
Michael Niedermayer [Sun, 16 Jun 2013 13:27:39 +0000 (15:27 +0200)]
avcodec/jpeg2000dec: move bpno check to a earlier place

This prevents additional integer overflows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoutils: fix avcodec_flush_buffers pre-reference counting compatibility
Janne Grunau [Sat, 15 Jun 2013 19:11:55 +0000 (22:11 +0300)]
utils: fix avcodec_flush_buffers pre-reference counting compatibility

The to_free AVframe must be freed just like the other ones.
Indeed, the calling application may expect all frames to be
released.

(This regression caused use-after-free in VLC with hwaccel.)

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agoavf: move url utility functions in a separate file
Luca Barbato [Sat, 15 Jun 2013 10:03:27 +0000 (12:03 +0200)]
avf: move url utility functions in a separate file

7 years agoavf: move ff_write_chained to mux.c
Luca Barbato [Sat, 15 Jun 2013 09:56:36 +0000 (11:56 +0200)]
avf: move ff_write_chained to mux.c

7 years agoavf: move riff tags accessors where they belong
Luca Barbato [Sat, 15 Jun 2013 09:44:07 +0000 (11:44 +0200)]
avf: move riff tags accessors where they belong

7 years agoavf: move ff_http_match_no_proxy to network
Luca Barbato [Sat, 15 Jun 2013 09:41:36 +0000 (11:41 +0200)]
avf: move ff_http_match_no_proxy to network

It is only used by network protocols.

7 years agoavf: split off format register and lookup function
Luca Barbato [Sat, 15 Jun 2013 09:26:09 +0000 (11:26 +0200)]
avf: split off format register and lookup function

7 years agolavu/adler32: Fix doxy group definition, take two
James Almer [Sun, 16 Jun 2013 00:29:08 +0000 (21:29 -0300)]
lavu/adler32: Fix doxy group definition, take two

The description if for the function, not the group.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavu/hash: Add support for RIPEMD
James Almer [Sun, 16 Jun 2013 00:29:07 +0000 (21:29 -0300)]
lavu/hash: Add support for RIPEMD

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agorawdec: allocate a buffer in the appropriate size in the copy case.
Hendrik Leppkes [Sun, 16 Jun 2013 07:46:17 +0000 (09:46 +0200)]
rawdec: allocate a buffer in the appropriate size in the copy case.

Otherwise the created buffer can be smaller than buf_size, which results
in buffer overreads if the original image has extra padding on every line.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobitstream: forward error values and drop few abort()
Luca Barbato [Sat, 15 Jun 2013 08:28:30 +0000 (10:28 +0200)]
bitstream: forward error values and drop few abort()

7 years agobitstream: K&R formatting cosmetics
Luca Barbato [Sat, 15 Jun 2013 08:19:51 +0000 (10:19 +0200)]
bitstream: K&R formatting cosmetics

7 years agoMerge branch 'crypto' of https://github.com/jamrial/FFmpeg
Michael Niedermayer [Sat, 15 Jun 2013 23:07:13 +0000 (01:07 +0200)]
Merge branch 'crypto' of https://github.com/jamrial/FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavu: Add RIPEMD hashing
James Almer [Sat, 15 Jun 2013 17:04:19 +0000 (14:04 -0300)]
lavu: Add RIPEMD hashing

Includes RIPEMD-128, RIPEMD-160, RIPEMD-256 and RIPEMD-320

Signed-off-by: James Almer <jamrial@gmail.com>
7 years agolavf/md5enc: Use AV_HASH_MAX_SIZE
James Almer [Sat, 15 Jun 2013 17:03:37 +0000 (14:03 -0300)]
lavf/md5enc: Use AV_HASH_MAX_SIZE

Also increase the buffer size in write_trailer(), since 128
is not enough anymore

Signed-off-by: James Almer <jamrial@gmail.com>
7 years agolavu/hash: Add support for SHA-2 512
James Almer [Sun, 2 Jun 2013 20:48:49 +0000 (17:48 -0300)]
lavu/hash: Add support for SHA-2 512

Signed-off-by: James Almer <jamrial@gmail.com>
7 years agolavu/utils: silence warnings about incompatible pointer types
Paul B Mahol [Sat, 15 Jun 2013 20:55:27 +0000 (20:55 +0000)]
lavu/utils: silence warnings about incompatible pointer types

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoDocument "cache" protocol
Andrey Utkin [Sat, 15 Jun 2013 20:03:38 +0000 (23:03 +0300)]
Document "cache" protocol

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264_mp4toannexb_bsf: return a padded buffer
Luca Barbato [Tue, 11 Jun 2013 15:57:31 +0000 (17:57 +0200)]
h264_mp4toannexb_bsf: return a padded buffer

The code using the returned buffer might expect it to be
FF_INPUT_BUFFER_PADDING_SIZE padded as any other avpacket.

7 years agoh264_mp4toannexb_bsf: factor out extradata parsing
Luca Barbato [Tue, 11 Jun 2013 14:44:04 +0000 (16:44 +0200)]
h264_mp4toannexb_bsf: factor out extradata parsing

7 years agoavcodec/vc1dec: Check source picture availability in vc1_mc_4mv_chroma4()
Michael Niedermayer [Sat, 15 Jun 2013 11:10:43 +0000 (13:10 +0200)]
avcodec/vc1dec: Check source picture availability in vc1_mc_4mv_chroma4()

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavutil/utils: check and warn about llrint() brokenness
Michael Niedermayer [Fri, 7 Jun 2013 00:25:34 +0000 (02:25 +0200)]
avutil/utils: check and warn about llrint() brokenness

Such broken llrint() exist for example on netbsd

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264_mp4toannexb_bsf: K&R formatting cosmetics
Luca Barbato [Tue, 11 Jun 2013 14:12:01 +0000 (16:12 +0200)]
h264_mp4toannexb_bsf: K&R formatting cosmetics

7 years agolavu/md5: Add doxy
James Almer [Fri, 14 Jun 2013 08:42:57 +0000 (05:42 -0300)]
lavu/md5: Add doxy

Mostly a copy&paste from other hash functions, with changes
where required.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavu/crc: Fix doxy group definition
James Almer [Fri, 14 Jun 2013 08:42:56 +0000 (05:42 -0300)]
lavu/crc: Fix doxy group definition

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavu/adler32: Fix doxy group definition
James Almer [Fri, 14 Jun 2013 08:42:55 +0000 (05:42 -0300)]
lavu/adler32: Fix doxy group definition

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoadded start_number parameter to drawtext to permit an offset to n/frame_num var
Mark Visser [Tue, 21 May 2013 20:14:46 +0000 (16:14 -0400)]
added start_number parameter to drawtext to permit an offset to n/frame_num var

7 years agoavcodec/g2meet: Check monochrome cursor width
Michael Niedermayer [Fri, 14 Jun 2013 19:13:47 +0000 (21:13 +0200)]
avcodec/g2meet: Check monochrome cursor width

Fixes out of array write

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/jpeg2000dec: check len before parsing header
Michael Niedermayer [Fri, 14 Jun 2013 17:20:10 +0000 (19:20 +0200)]
avcodec/jpeg2000dec: check len before parsing header

Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/jpeg2000dec: Check Psot
Michael Niedermayer [Fri, 14 Jun 2013 17:16:47 +0000 (19:16 +0200)]
avcodec/jpeg2000dec: Check Psot

Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoapetag: do not require seekable output
Paul B Mahol [Thu, 6 Jun 2013 13:35:49 +0000 (13:35 +0000)]
apetag: do not require seekable output

Also don't write empty tags.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavcodec_encode_audio2: fix memleak on last padded frame
Michael Niedermayer [Fri, 14 Jun 2013 13:20:48 +0000 (15:20 +0200)]
avcodec_encode_audio2: fix memleak on last padded frame

Regression introduced by 799f57ac96f9891d1a0f7d6c4b218ed536e8aca5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegts: Enable muxing of SMPTE KLV metadata
Peter Ross [Thu, 11 Apr 2013 16:57:15 +0000 (09:57 -0700)]
mpegts: Enable muxing of SMPTE KLV metadata

Muxer code rebased/split out by: Jeff Blackburne <jblackburne@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovc1_parser: fix parsing of the frame headers in interlaced streams
Hendrik Leppkes [Thu, 13 Jun 2013 22:15:10 +0000 (00:15 +0200)]
vc1_parser: fix parsing of the frame headers in interlaced streams

first_pic_header_flag needs to be set to allow the parsing code to change
some stream parameters, and not error out.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/spp: fix description.
Clément Bœsch [Fri, 14 Jun 2013 04:53:45 +0000 (06:53 +0200)]
lavfi/spp: fix description.

7 years agodoc/general: Make the license status of the Android libraries clearer
Timothy Gu [Tue, 11 Jun 2013 23:52:12 +0000 (16:52 -0700)]
doc/general: Make the license status of the Android libraries clearer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodrawbox: Respect thickness parameter
Jean Delvare [Wed, 12 Jun 2013 08:48:57 +0000 (10:48 +0200)]
drawbox: Respect thickness parameter

The drawbox video filter is drawing lines one pixel thinner than
requested. The default thickness is 4 pixel but in fact the lines
drawn by default are only 3 pixel wide.

Change the comparisons in the code to fix this off-by-one bug. Also
change the default thickness from 4 to 3 to minimize the unexpected
changes from the user's perspective.

As I was already touching these lines, I also removed the "maximum" in
the thickness parameter description, as I don't think it was adding
any value and I even found it confusing.

Reviewed-by: Andrey Utkin <andrey.krieger.utkin@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agojpeg2000dec: Check compno in get_coc()
Michael Niedermayer [Thu, 13 Jun 2013 23:54:30 +0000 (01:54 +0200)]
jpeg2000dec: Check compno in get_coc()

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/mp: remove mp=spp.
Clément Bœsch [Thu, 13 Jun 2013 23:09:11 +0000 (01:09 +0200)]
lavfi/mp: remove mp=spp.

The filter was ported to a native libavfilter filter.