OSDN Git Service

android-x86/external-ffmpeg.git
9 years agolavc/pnm: Support decoding ya16.
Carl Eugen Hoyos [Thu, 22 Jan 2015 00:49:04 +0000 (01:49 +0100)]
lavc/pnm: Support decoding ya16.

9 years agolavc/pamenc: Support encoding ya16be.
Carl Eugen Hoyos [Thu, 22 Jan 2015 00:47:54 +0000 (01:47 +0100)]
lavc/pamenc: Support encoding ya16be.

9 years agolavc/tiffenc: Support encoding ya16le.
Carl Eugen Hoyos [Thu, 22 Jan 2015 00:38:58 +0000 (01:38 +0100)]
lavc/tiffenc: Support encoding ya16le.

9 years agolavc/pngenc: Support encoding ya16be.
Carl Eugen Hoyos [Thu, 22 Jan 2015 00:33:05 +0000 (01:33 +0100)]
lavc/pngenc: Support encoding ya16be.

9 years agolibrtmp: Allow changing the socket send buffer size
Brian Brice [Tue, 20 Jan 2015 03:01:00 +0000 (21:01 -0600)]
librtmp: Allow changing the socket send buffer size

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibavformat/img2dec: fix warning when !HAVE_GLOB
Christophe Gisquet [Tue, 20 Jan 2015 21:03:18 +0000 (22:03 +0100)]
libavformat/img2dec: fix warning when !HAVE_GLOB

Variables are unused in this case.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'da9bffaf08a1173451da1b4e1ae50881e7093642'
Michael Niedermayer [Wed, 21 Jan 2015 20:30:48 +0000 (21:30 +0100)]
Merge commit 'da9bffaf08a1173451da1b4e1ae50881e7093642'

* commit 'da9bffaf08a1173451da1b4e1ae50881e7093642':
  doc/platform: Reference only MSYS2 and MinGW-w64

Conflicts:
doc/platform.texi

See: 6c906ded380e9a11ff350c17f0e03271c8fb6154
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoswscale/input: fix rgba64 alpha non native
Michael Niedermayer [Wed, 21 Jan 2015 19:23:45 +0000 (20:23 +0100)]
swscale/input: fix rgba64 alpha non native

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoswscale/input: Fix alpha of YA16 input
Michael Niedermayer [Wed, 21 Jan 2015 19:14:34 +0000 (20:14 +0100)]
swscale/input: Fix alpha of YA16 input

Fixes Ticket4278

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/vf_showinfo: show timebase & framerate too
Michael Niedermayer [Sat, 17 Jan 2015 14:16:42 +0000 (15:16 +0100)]
avfilter/vf_showinfo: show timebase & framerate too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/vf_lenscorrection: support 8bit planar RGB formats
Paul B Mahol [Tue, 20 Jan 2015 17:16:21 +0000 (17:16 +0000)]
avfilter/vf_lenscorrection: support 8bit planar RGB formats

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agodoc/platform: Reference only MSYS2 and MinGW-w64
Derek Buitenhuis [Mon, 19 Jan 2015 18:47:20 +0000 (18:47 +0000)]
doc/platform: Reference only MSYS2 and MinGW-w64

It's better to steer users at these, since they are both better
and more alive than the mingw.org versions.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years agodoc/platform: Reference only MSYS2 and MinGW-w64
Derek Buitenhuis [Mon, 19 Jan 2015 18:47:20 +0000 (18:47 +0000)]
doc/platform: Reference only MSYS2 and MinGW-w64

It's better to steer users at these, since they are both better
and more alive than the mingw.org versions.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years agodoc/APIchanges: fill in and correct some values
Michael Niedermayer [Wed, 21 Jan 2015 13:24:08 +0000 (14:24 +0100)]
doc/APIchanges: fill in and correct some values

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodoc/APIchanges: Add av_find_best_pix_fmt_of_2() and av_get_pix_fmt_loss()
Michael Niedermayer [Wed, 21 Jan 2015 11:27:36 +0000 (12:27 +0100)]
doc/APIchanges: Add av_find_best_pix_fmt_of_2() and av_get_pix_fmt_loss()

also add deprecation note for avcodec_get_pix_fmt_loss(), avcodec_find_best_pix_fmt_of_2()

Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/nvenc: set repeatSPSPPS flag for streaming
agathah [Wed, 21 Jan 2015 05:53:29 +0000 (13:53 +0800)]
avcodec/nvenc: set repeatSPSPPS flag for streaming

Reviewed-by: Timo Rothenpieler <timo@rothenpieler.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffprobe: fix memleaks on errors
Michael Niedermayer [Wed, 21 Jan 2015 04:35:50 +0000 (05:35 +0100)]
ffprobe: fix memleaks on errors

Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibavcodec/ppc/mpegvideoencdsp.c: fix stack smashing in pix_norm1_altivec() and pix_s...
Andreas Cadhalpun [Tue, 20 Jan 2015 17:46:01 +0000 (18:46 +0100)]
libavcodec/ppc/mpegvideoencdsp.c: fix stack smashing in pix_norm1_altivec() and pix_sum_altivec()

The vec_ste calls were mistakenly changed to vec_vsx_st in c5ca76a, which
caused stack smashing.

Changing them back fixes crashes on ppc64el, when configured with
--toolchain=hardened.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '440119b18836887d98c9e337c5911563bb43588c'
Michael Niedermayer [Tue, 20 Jan 2015 20:29:19 +0000 (21:29 +0100)]
Merge commit '440119b18836887d98c9e337c5911563bb43588c'

* commit '440119b18836887d98c9e337c5911563bb43588c':
  libopenh264enc: Move a declaration of a variable into an ifdef

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'bba02479260d0e7dec8c530a7e75a1c7aa53c06e'
Michael Niedermayer [Tue, 20 Jan 2015 20:15:17 +0000 (21:15 +0100)]
Merge commit 'bba02479260d0e7dec8c530a7e75a1c7aa53c06e'

* commit 'bba02479260d0e7dec8c530a7e75a1c7aa53c06e':
  libopenh264enc: Remove a workaround for silencing warnings about unused variables in the OpenH264 header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'ea3fc9fe68752eb1b9078b28bea18a1e781d1c2c'
Michael Niedermayer [Tue, 20 Jan 2015 20:09:16 +0000 (21:09 +0100)]
Merge commit 'ea3fc9fe68752eb1b9078b28bea18a1e781d1c2c'

* commit 'ea3fc9fe68752eb1b9078b28bea18a1e781d1c2c':
  smoothstreamingenc: Add a missing "goto fail"

See: f2e12f8942e5434df3d0f41851a1560fc4663dae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/af_join: swap av_mallocz_array() args for consistency with the prototype
Paul B Mahol [Tue, 20 Jan 2015 16:52:30 +0000 (16:52 +0000)]
avfilter/af_join: swap av_mallocz_array() args for consistency with the prototype

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agoavfilter/af_join: Use av_mallocz_array()
Paul B Mahol [Tue, 20 Jan 2015 16:41:18 +0000 (16:41 +0000)]
avfilter/af_join: Use av_mallocz_array()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agoavfilter/af_ashowinfo: Use av_realloc_array()
Michael Niedermayer [Tue, 20 Jan 2015 15:26:42 +0000 (16:26 +0100)]
avfilter/af_ashowinfo: Use av_realloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavdevice/alsa-audio-common: Use *alloc_array()
Michael Niedermayer [Tue, 20 Jan 2015 15:24:21 +0000 (16:24 +0100)]
avdevice/alsa-audio-common: Use *alloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agofix Makefile: remove ilpack
Paul B Mahol [Tue, 20 Jan 2015 15:48:43 +0000 (15:48 +0000)]
fix Makefile: remove ilpack

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agolavfi: remove mp=ilpack
Paul B Mahol [Tue, 20 Jan 2015 15:36:31 +0000 (15:36 +0000)]
lavfi: remove mp=ilpack

Filter does not work, asserts here.
scale=interl=1,format=yuv422p should be used instead.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agolibopenh264enc: Move a declaration of a variable into an ifdef
Martin Storsjö [Wed, 7 Jan 2015 22:03:36 +0000 (00:03 +0200)]
libopenh264enc: Move a declaration of a variable into an ifdef

This avoids needing an attribute for silencing warnings about
it being unused.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agolibopenh264enc: Remove a workaround for silencing warnings about unused variables...
Martin Storsjö [Thu, 8 Jan 2015 11:50:58 +0000 (13:50 +0200)]
libopenh264enc: Remove a workaround for silencing warnings about unused variables in the OpenH264 header

The 1.3 release branch of OpenH264 (as well as the master branch)
have been updated so that GCC no longer warns about this variable
as being unused.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agochanged name of erase_display_memory to screen_changed
Anshul Maheshwari [Tue, 20 Jan 2015 10:40:36 +0000 (16:10 +0530)]
changed name of erase_display_memory to screen_changed

Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoInitilaize array to known size
Anshul Maheshwari [Tue, 20 Jan 2015 10:29:48 +0000 (15:59 +0530)]
Initilaize array to known size

Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoCHAR_DEBUG to av_dlog
Anshul Maheshwari [Tue, 20 Jan 2015 10:24:58 +0000 (15:54 +0530)]
CHAR_DEBUG to av_dlog

Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoCosmetic changes in cc_caption
Anshul Maheshwari [Tue, 20 Jan 2015 10:21:23 +0000 (15:51 +0530)]
Cosmetic changes in cc_caption

Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoRevert "avcodec/h264: also show frames with missing fields when CODEC_FLAG2_SHOW_ALL...
Michael Niedermayer [Tue, 20 Jan 2015 01:51:33 +0000 (02:51 +0100)]
Revert "avcodec/h264: also show frames with missing fields when CODEC_FLAG2_SHOW_ALL is set"

Fixes regression
Fixes Ticket4274

Suggested-by: kierank
This reverts commit fe439c20698fc4992b9373cb068efb438fe1a098.

9 years agoavcodec/snowdec: AVMotionVector support
Michael Niedermayer [Tue, 20 Jan 2015 00:16:25 +0000 (01:16 +0100)]
avcodec/snowdec: AVMotionVector support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/snowdec: set AVFrame.pict_type correctly
Michael Niedermayer [Tue, 20 Jan 2015 00:10:37 +0000 (01:10 +0100)]
avcodec/snowdec: set AVFrame.pict_type correctly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agosmoothstreamingenc: Add a missing "goto fail"
Michael Niedermayer [Tue, 13 Jan 2015 23:17:52 +0000 (00:17 +0100)]
smoothstreamingenc: Add a missing "goto fail"

This goto wasn't necessary originally, but it should have been
added when the write_manifest call was added in 8e276378.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoavfilter/vf_idet: factorize av_frame_free(&idet->prev)
Michael Niedermayer [Mon, 19 Jan 2015 19:24:03 +0000 (20:24 +0100)]
avfilter/vf_idet: factorize av_frame_free(&idet->prev)

Found-by: Pascal Massimino <pascal.massimino@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoh264: unref leaking error recovery picture
wm4 [Mon, 19 Jan 2015 16:14:44 +0000 (17:14 +0100)]
h264: unref leaking error recovery picture

This leaked a frame on each avcodec_flush_buffers() call, if frame
threading was enabled. It caused severe memory usage in player if you
were seeking a lot.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/xsubdec: Check av_mallocz() return codes
Michael Niedermayer [Mon, 19 Jan 2015 16:15:15 +0000 (17:15 +0100)]
avcodec/xsubdec: Check av_mallocz() return codes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/xan: Use av_realloc_array()
Michael Niedermayer [Mon, 19 Jan 2015 16:12:09 +0000 (17:12 +0100)]
avcodec/xan: Use av_realloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/avfilter: allow idet like scale to have parameter changes
Michael Niedermayer [Mon, 19 Jan 2015 04:37:42 +0000 (05:37 +0100)]
avfilter/avfilter: allow idet like scale to have parameter changes

Fixes assertion failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/vf_idet: flush internal buffers on parameter changes
Michael Niedermayer [Mon, 19 Jan 2015 04:36:27 +0000 (05:36 +0100)]
avfilter/vf_idet: flush internal buffers on parameter changes

This is needed to auto insert the filter by default

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/vf_idet: reduce noisyness if the filter has been auto inserted
Michael Niedermayer [Mon, 19 Jan 2015 04:14:15 +0000 (05:14 +0100)]
avfilter/vf_idet: reduce noisyness if the filter has been auto inserted

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: Reduce noisiness of frame clipping in rate convertion
Michael Niedermayer [Fri, 16 Jan 2015 23:17:31 +0000 (00:17 +0100)]
ffmpeg: Reduce noisiness of frame clipping in rate convertion

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: Favor filter graph based duration over ost->frame_rate in fps code
Michael Niedermayer [Fri, 16 Jan 2015 19:43:57 +0000 (20:43 +0100)]
ffmpeg: Favor filter graph based duration over ost->frame_rate in fps code

The fate change adds a last frame with a subtitle not displayed in the previous

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavdevice/openal-dec: Check the return code of av_new_packet()
Michael Niedermayer [Sun, 18 Jan 2015 23:34:18 +0000 (00:34 +0100)]
avdevice/openal-dec: Check the return code of av_new_packet()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibavformat/mxfdec.c: support demuxing opatom audio without index
Mark Reid [Thu, 15 Jan 2015 03:26:11 +0000 (19:26 -0800)]
libavformat/mxfdec.c: support demuxing opatom audio without index

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/svq1enc: fix error handling/cleanup in case of ff_get_buffer() or scratchbuff...
Michael Niedermayer [Sun, 18 Jan 2015 20:25:06 +0000 (21:25 +0100)]
avcodec/svq1enc: fix error handling/cleanup in case of ff_get_buffer() or scratchbuffer alloc failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/svq1enc: Check memory allocations
Michael Niedermayer [Sun, 18 Jan 2015 20:17:18 +0000 (21:17 +0100)]
avcodec/svq1enc: Check memory allocations

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/rmdec: Check the return value of av_get_packet()
Michael Niedermayer [Sun, 18 Jan 2015 19:55:49 +0000 (20:55 +0100)]
avformat/rmdec: Check the return value of av_get_packet()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/nsvdec: Check the return value of av_get_packet()
Michael Niedermayer [Sun, 18 Jan 2015 19:52:25 +0000 (20:52 +0100)]
avformat/nsvdec: Check the return value of av_get_packet()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/showcqt: add gamma2 option
Muhammad Faiz [Sat, 17 Jan 2015 15:52:11 +0000 (22:52 +0700)]
avfilter/showcqt: add gamma2 option

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/mpegvideo_parser: Check the ff_set_dimensions() return code
Michael Niedermayer [Sun, 18 Jan 2015 03:46:03 +0000 (04:46 +0100)]
avcodec/mpegvideo_parser: Check the ff_set_dimensions() return code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/mpegvideo_parser: more robust dimension setup
Michael Niedermayer [Sun, 18 Jan 2015 03:39:41 +0000 (04:39 +0100)]
avcodec/mpegvideo_parser: more robust dimension setup

Before this missing seq headers could have led to wrong dimensions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/sbgdec: remove double ;;
Clément Bœsch [Sat, 17 Jan 2015 23:36:56 +0000 (00:36 +0100)]
avformat/sbgdec: remove double ;;

9 years agoavdevice/pulse_audio_dec: remove double ;;
Clément Bœsch [Sat, 17 Jan 2015 23:35:04 +0000 (00:35 +0100)]
avdevice/pulse_audio_dec: remove double ;;

9 years agoavcodec/vp8: remove double ;;
Clément Bœsch [Sat, 17 Jan 2015 23:34:19 +0000 (00:34 +0100)]
avcodec/vp8: remove double ;;

9 years agoavcodec/tiffenc: remove double ;;
Clément Bœsch [Sat, 17 Jan 2015 23:33:02 +0000 (00:33 +0100)]
avcodec/tiffenc: remove double ;;

9 years agoavformat/asfdec: Check the av_get_packet() return value
Michael Niedermayer [Sat, 17 Jan 2015 19:39:43 +0000 (20:39 +0100)]
avformat/asfdec: Check the av_get_packet() return value

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/rtpdec_hevc: Fix 2 "may be used uninitialized in this function" warnings
Michael Niedermayer [Sat, 17 Jan 2015 19:27:31 +0000 (20:27 +0100)]
avformat/rtpdec_hevc: Fix 2 "may be used uninitialized in this function" warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/nvenc: Add support for nvenc api version 5
Timo Rothenpieler [Fri, 16 Jan 2015 00:02:40 +0000 (01:02 +0100)]
avcodec/nvenc: Add support for nvenc api version 5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/dvbsubdec: Check get_region() return value
Michael Niedermayer [Sat, 17 Jan 2015 15:21:36 +0000 (16:21 +0100)]
avcodec/dvbsubdec: Check get_region() return value

Fixes null pointer dereference with DEBUG enabled

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/nsvdec: Check av_get_packet() return value
Michael Niedermayer [Sat, 17 Jan 2015 15:05:08 +0000 (16:05 +0100)]
avformat/nsvdec: Check av_get_packet() return value

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/vf_frei0r: fix build with DEBUG enabled
Michael Niedermayer [Sat, 17 Jan 2015 14:41:23 +0000 (15:41 +0100)]
avfilter/vf_frei0r: fix build with DEBUG enabled

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/vf_frei0r: also set AVFilterLink.frame_rate
Michael Niedermayer [Sat, 17 Jan 2015 13:46:21 +0000 (14:46 +0100)]
avfilter/vf_frei0r: also set AVFilterLink.frame_rate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/mss12: Use av_malloc_array()
Michael Niedermayer [Sat, 17 Jan 2015 12:01:26 +0000 (13:01 +0100)]
avcodec/mss12: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/libopusenc: Use av_mallocz_array()
Michael Niedermayer [Sat, 17 Jan 2015 11:58:56 +0000 (12:58 +0100)]
avcodec/libopusenc: Use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/libmp3lame: use av_malloc_array()
Michael Niedermayer [Sat, 17 Jan 2015 11:56:19 +0000 (12:56 +0100)]
avcodec/libmp3lame: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/flac_parser: fix handling EOF if no headers are found
Michael Niedermayer [Sat, 17 Jan 2015 00:56:03 +0000 (01:56 +0100)]
avcodec/flac_parser: fix handling EOF if no headers are found

Fixes assertion failure
Fixes Ticket4269

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/flac_parser: print error messages in case of errors
Michael Niedermayer [Sat, 17 Jan 2015 00:40:39 +0000 (01:40 +0100)]
avcodec/flac_parser: print error messages in case of errors

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoFix precission typos
Michael Niedermayer [Fri, 16 Jan 2015 21:42:42 +0000 (22:42 +0100)]
Fix precission typos

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/vf_framepack: Check and update frame_rate
Michael Niedermayer [Fri, 16 Jan 2015 20:36:26 +0000 (21:36 +0100)]
avfilter/vf_framepack: Check and update frame_rate

The frame_rate update was missing leaving the output frame rate
wrong.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: Use filter graph output frame rate also for frame duration estimation
Michael Niedermayer [Fri, 16 Jan 2015 19:15:15 +0000 (20:15 +0100)]
ffmpeg: Use filter graph output frame rate also for frame duration estimation

Previously the duration was sometimes wrong, this addition
limits the value and improves which frames are choosen when
reducing the frame rate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: Maintain higher precision pts between video filter and fps code
Michael Niedermayer [Fri, 16 Jan 2015 16:03:35 +0000 (17:03 +0100)]
ffmpeg: Maintain higher precision pts between video filter and fps code

This is a bit ugly as it attempts to keep most of the computation
in integers before the double based fps code. The use of integers
is to reduce the chances of rounding differences between platforms

Previously the timestamp was rounded to the encoder timebase
before being converted back to double precision which could cause loss
of precision

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: drop redundant frame_pts value
Michael Niedermayer [Fri, 16 Jan 2015 15:32:50 +0000 (16:32 +0100)]
ffmpeg: drop redundant frame_pts value

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '3941df546276b190cc9362fd093e6721e8e52f50'
Michael Niedermayer [Fri, 16 Jan 2015 13:20:12 +0000 (14:20 +0100)]
Merge commit '3941df546276b190cc9362fd093e6721e8e52f50'

* commit '3941df546276b190cc9362fd093e6721e8e52f50':
  aea: Return proper error code on invalid header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '2df7277711cbe3ca5415ff8e31228dcffa309211'
Michael Niedermayer [Fri, 16 Jan 2015 12:10:04 +0000 (13:10 +0100)]
Merge commit '2df7277711cbe3ca5415ff8e31228dcffa309211'

* commit '2df7277711cbe3ca5415ff8e31228dcffa309211':
  swscale: fix gbrap to gbrap alpha scaling

Conflicts:
libswscale/input.c
tests/ref/fate/filter-pixfmts-scale

Not merged, the code works fine as is and does not work with this
change

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '89df3fd49e9992441f680326902b4912d79f514f'
Michael Niedermayer [Fri, 16 Jan 2015 11:34:47 +0000 (12:34 +0100)]
Merge commit '89df3fd49e9992441f680326902b4912d79f514f'

* commit '89df3fd49e9992441f680326902b4912d79f514f':
  swscale: fix warning about incompatible function pointer type

Not merged, this change is incorrect for FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoaea: Return proper error code on invalid header
Nidhi Makhijani [Thu, 15 Jan 2015 12:50:03 +0000 (18:20 +0530)]
aea: Return proper error code on invalid header

9 years agoffmpeg: improve data stream support
Anshul Maheshwari [Fri, 16 Jan 2015 01:19:01 +0000 (02:19 +0100)]
ffmpeg: improve data stream support

This adds data codec/stream handling where previously there was only
audio/video/subtitles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoswscale: fix gbrap to gbrap alpha scaling
Vittorio Giovara [Thu, 15 Jan 2015 14:15:22 +0000 (15:15 +0100)]
swscale: fix gbrap to gbrap alpha scaling

9 years agoswscale: fix warning about incompatible function pointer type
Vittorio Giovara [Thu, 15 Jan 2015 14:15:21 +0000 (15:15 +0100)]
swscale: fix warning about incompatible function pointer type

9 years agoavformat: Improve data streams/codec support
Anshul Maheshwari [Fri, 16 Jan 2015 01:00:23 +0000 (02:00 +0100)]
avformat: Improve data streams/codec support

This adds data codec/stream handling where previously there was only
audio/video/subtitles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavdevice: Use av_format_get_control_message_cb()
Michael Niedermayer [Fri, 16 Jan 2015 01:10:35 +0000 (02:10 +0100)]
avdevice: Use av_format_get_control_message_cb()

This is required as the location of this field could change and is
specified in libavformat not avdevice

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: Add bitrate value under -progress action
raxon1s [Thu, 8 Jan 2015 02:50:15 +0000 (03:50 +0100)]
ffmpeg: Add bitrate value under -progress action

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/g2meet: Use av_mallocz_array() for framebuffer allocation
Michael Niedermayer [Thu, 15 Jan 2015 22:04:59 +0000 (23:04 +0100)]
avcodec/g2meet: Use av_mallocz_array() for framebuffer allocation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/g722enc: Use av_mallocz_array()
Michael Niedermayer [Thu, 15 Jan 2015 22:02:43 +0000 (23:02 +0100)]
avcodec/g722enc: Use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/flashsv2enc: use av_realloc_array()
Michael Niedermayer [Thu, 15 Jan 2015 22:00:52 +0000 (23:00 +0100)]
avcodec/flashsv2enc: use av_realloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/parser: Check that the parser return code is valid
Michael Niedermayer [Fri, 9 Jan 2015 12:02:44 +0000 (13:02 +0100)]
avcodec/parser: Check that the parser return code is valid

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/flac_parser: Check for av_malloc() failure
Michael Niedermayer [Thu, 15 Jan 2015 15:51:08 +0000 (16:51 +0100)]
avcodec/flac_parser: Check for av_malloc() failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/flac_parser: Use sizeof(variable) instead of sizeof(type)
Michael Niedermayer [Thu, 15 Jan 2015 15:48:54 +0000 (16:48 +0100)]
avcodec/flac_parser: Use sizeof(variable) instead of sizeof(type)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavutil/pixfmt: Support the AV_PIX_FMT_GBRAP* formats with AV_HAVE_INCOMPATIBLE_LIBAV_ABI
Michael Niedermayer [Thu, 15 Jan 2015 15:43:38 +0000 (16:43 +0100)]
avutil/pixfmt: Support the AV_PIX_FMT_GBRAP* formats with AV_HAVE_INCOMPATIBLE_LIBAV_ABI

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavutil/pixfmt: Document the duplicated AV_PIX_FMT_GBRAP* formats
Michael Niedermayer [Thu, 15 Jan 2015 15:41:15 +0000 (16:41 +0100)]
avutil/pixfmt: Document the duplicated AV_PIX_FMT_GBRAP* formats

This is similar to the other duplicated cases

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/id3v2: remove unused variable
Michael Niedermayer [Thu, 15 Jan 2015 15:36:14 +0000 (16:36 +0100)]
avformat/id3v2: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodoc: fix showpalette position
Clément Bœsch [Thu, 15 Jan 2015 15:40:02 +0000 (16:40 +0100)]
doc: fix showpalette position

9 years agoavfilter: add showpalette filter
Clément Bœsch [Thu, 15 Jan 2015 10:39:06 +0000 (11:39 +0100)]
avfilter: add showpalette filter

9 years agoavcodec/nvenc: fix b frame settings
agathah [Wed, 7 Jan 2015 09:19:32 +0000 (17:19 +0800)]
avcodec/nvenc: fix b frame settings

Reviewed-by: Timo Rothenpieler <timo@rothenpieler.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '024e5a2d5ff8a94adce48abb15ce2fb471f9d18e'
Michael Niedermayer [Thu, 15 Jan 2015 13:45:01 +0000 (14:45 +0100)]
Merge commit '024e5a2d5ff8a94adce48abb15ce2fb471f9d18e'

* commit '024e5a2d5ff8a94adce48abb15ce2fb471f9d18e':
  rtmppkt: Repeat the full 32 bit timestamp for chunking continuation packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'def69553e745e007925147b2e7e4b32c57d08fdf'
Michael Niedermayer [Thu, 15 Jan 2015 13:31:33 +0000 (14:31 +0100)]
Merge commit 'def69553e745e007925147b2e7e4b32c57d08fdf'

* commit 'def69553e745e007925147b2e7e4b32c57d08fdf':
  h264_cabac: Break infinite loops

Conflicts:
libavcodec/h264_cabac.c

See: cdf0877bc341684c56ac1fe057397adbadf329ee
Merged-by: Michael Niedermayer <michaelni@gmx.at>