OSDN Git Service
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>
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>
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>
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>
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>
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>
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>
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.
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Clément Bœsch [Sat, 17 Jan 2015 23:36:56 +0000 (00:36 +0100)]
avformat/sbgdec: remove double ;;
Clément Bœsch [Sat, 17 Jan 2015 23:35:04 +0000 (00:35 +0100)]
avdevice/pulse_audio_dec: remove double ;;
Clément Bœsch [Sat, 17 Jan 2015 23:34:19 +0000 (00:34 +0100)]
avcodec/vp8: remove double ;;
Clément Bœsch [Sat, 17 Jan 2015 23:33:02 +0000 (00:33 +0100)]
avcodec/tiffenc: remove double ;;
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Nidhi Makhijani [Thu, 15 Jan 2015 12:50:03 +0000 (18:20 +0530)]
aea: Return proper error code on invalid header
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>
Vittorio Giovara [Thu, 15 Jan 2015 14:15:22 +0000 (15:15 +0100)]
swscale: fix gbrap to gbrap alpha scaling
Vittorio Giovara [Thu, 15 Jan 2015 14:15:21 +0000 (15:15 +0100)]
swscale: fix warning about incompatible function pointer type
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Clément Bœsch [Thu, 15 Jan 2015 15:40:02 +0000 (16:40 +0100)]
doc: fix showpalette position
Clément Bœsch [Thu, 15 Jan 2015 10:39:06 +0000 (11:39 +0100)]
avfilter: add showpalette filter
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>
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>
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>
Michael Niedermayer [Thu, 15 Jan 2015 12:54:29 +0000 (13:54 +0100)]
Michael Niedermayer [Thu, 15 Jan 2015 12:47:12 +0000 (13:47 +0100)]
Merge commit '
8a9641a652ed1546fedfda22584f79d3d423096e'
* commit '
8a9641a652ed1546fedfda22584f79d3d423096e':
bsf: check memory allocations
Conflicts:
libavcodec/noise_bsf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Jan 2015 12:10:37 +0000 (13:10 +0100)]
Merge commit '
014b6b416fec89777cb9cff61bcf7896eaf7cf39'
* commit '
014b6b416fec89777cb9cff61bcf7896eaf7cf39':
vp8: improve memory allocation checks
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Jan 2015 11:58:25 +0000 (12:58 +0100)]
Merge commit '
54bc15d5ebfd07fd468743ba29f709ea19e840b9'
* commit '
54bc15d5ebfd07fd468743ba29f709ea19e840b9':
id3v2: fix reading v2.2 attached pictures
Conflicts:
libavformat/id3v2.c
See:
05c3c568dccd6c42fdf6eea891d08c71fe2ee772
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Jan 2015 11:53:53 +0000 (12:53 +0100)]
Merge commit '
932788be5af8dee062c77851b573ea47dd6d047a'
* commit '
932788be5af8dee062c77851b573ea47dd6d047a':
id3v2: add names to the parameters of ID3v2EMFunc.read
Conflicts:
libavformat/id3v2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Jan 2015 11:46:13 +0000 (12:46 +0100)]
avformat/id3v2: Fix incompatible pointer type warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Jan 2015 11:45:20 +0000 (12:45 +0100)]
Merge commit '
8809c974a3fb51f96e498a5556a4a5bbacc581ce'
* commit '
8809c974a3fb51f96e498a5556a4a5bbacc581ce':
id3v2: constify the 'tag' parameter to special metadata parsing callback
Conflicts:
libavformat/id3v2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Thu, 15 Jan 2015 10:39:41 +0000 (11:39 +0100)]
avfilter/edgedetect: fix indent
Martin Storsjö [Wed, 14 Jan 2015 21:09:06 +0000 (23:09 +0200)]
rtmppkt: Repeat the full 32 bit timestamp for chunking continuation packets
This fixes sending chunked packets (packets larger than the output
chunk size, which often can be e.g. 4096 bytes) with a timestamp delta
(or absolute timstamp, if it's a timestamp step backwards, or the
first packet of the stream) larger than 0xffffffff.
The RTMP spec explicitly says (in section 5.3.1.3.) that packets of
type 3 (continuation packets) should include this field, if the
previous non-continuation packet had it included.
The receiving code handles these packets correctly.
Pointed out by Cheolho Park.
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Thu, 31 Jan 2013 03:20:24 +0000 (04:20 +0100)]
h264_cabac: Break infinite loops
This fixes out of array reads and/or infinite loops.
30 is the maximum number of bits that can be read into
coeff_abs below.
CC: libav-stable@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Thu, 15 Jan 2015 05:00:25 +0000 (06:00 +0100)]
Merge commit '
f86f39cb9b1fcd063d5e4812132a75c06cc7acd2'
* commit '
f86f39cb9b1fcd063d5e4812132a75c06cc7acd2':
tiff: support decoding GBRP and GBRAP formats
Conflicts:
libavcodec/tiff.c
See:
379ad9788b80e05c0379adc49b26704dfd27d564
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Jan 2015 04:46:51 +0000 (05:46 +0100)]
Merge commit '
928061670e873e816daa14827853b7e11221ff5f'
* commit '
928061670e873e816daa14827853b7e11221ff5f':
libswscale: GBRAP input & output and GBRAP16 input support
Conflicts:
libswscale/input.c
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
libswscale/utils.c
tests/ref/fate/filter-pixdesc-gbrap
tests/ref/fate/filter-pixfmts-copy
tests/ref/fate/filter-pixfmts-null
tests/ref/fate/filter-pixfmts-scale
tests/ref/fate/filter-pixfmts-vflip
See:
5c057433ccd32f37ddc828d3f82c5b1ad7d3e3db
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Jan 2015 04:35:00 +0000 (05:35 +0100)]
Merge commit '
9a4aaae3b29392b6d74997e06be249d7d54a7394'
* commit '
9a4aaae3b29392b6d74997e06be249d7d54a7394':
lavc: add GBRAP to avcodec_align_dimensions2
See:
5c057433ccd32f37ddc828d3f82c5b1ad7d3e3db
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Jan 2015 04:23:47 +0000 (05:23 +0100)]
Merge commit '
0e6c7dfa650e8b0497bfa7a06394b7a462ddc33a'
* commit '
0e6c7dfa650e8b0497bfa7a06394b7a462ddc33a':
lavu: add planar 16 bit and 8 bit rgb with alpha
Conflicts:
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h
See:
e6d4e687558d08187e7a415a7725e4b1a416f782
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Jan 2015 03:56:32 +0000 (04:56 +0100)]
Merge commit '
e2ad0b66fa273c5c823978e8f601f2c0d9ee42f8'
* commit '
e2ad0b66fa273c5c823978e8f601f2c0d9ee42f8':
imgutils: create misc functions for dealing with buffers
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/avpicture.c
libavutil/imgutils.c
libavutil/imgutils.h
libavutil/version.h
See:
e6674e46ecdd7aaa93d7f7d818eb1c8224b35eae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Jan 2015 03:26:16 +0000 (04:26 +0100)]
avformat/mov: Do not set aspect ratios that would contain zeros
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Jan 2015 03:20:43 +0000 (04:20 +0100)]
avformat/mov: rewrite aspect from matrix code
The original code was intended purely for rotation == 0
In
cf70ba37ba74089a18295b29e77dead0a3222c9e the condition was
changed to use it only for rotation != 0
which broke the cases for which it was intended to be used
as well as breaking cases for which it was not intended to be
used.
This changes the code so it could work for the more general
case and fixes the regressions
If you have sample files that are not handled correctly
please open tickets or mail me!
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Jan 2015 02:02:14 +0000 (03:02 +0100)]
Merge commit '
cf70ba37ba74089a18295b29e77dead0a3222c9e'
* commit '
cf70ba37ba74089a18295b29e77dead0a3222c9e':
mov: Check angle rather than full matrix when updating SAR
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Jan 2015 01:52:47 +0000 (02:52 +0100)]
Michael Niedermayer [Thu, 15 Jan 2015 01:05:17 +0000 (02:05 +0100)]
Merge commit '
456ffec35d55288d589aa1901919e038c3427f30'
* commit '
456ffec35d55288d589aa1901919e038c3427f30':
img2dec: correctly use the parsed value from -start_number
No change, start_number works fine without this change
and does not work with it
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Wed, 14 Jan 2015 16:46:07 +0000 (17:46 +0100)]
opus_parser: drop unused variable
Vittorio Giovara [Thu, 18 Dec 2014 19:26:56 +0000 (20:26 +0100)]
bsf: check memory allocations
Vittorio Giovara [Wed, 17 Dec 2014 15:02:08 +0000 (16:02 +0100)]
vp8: improve memory allocation checks
Check memory earlier, check one more allocation and clean up on error.
CC: libav-stable@libav.org
Bug-Id: CID
1257773
Michael Niedermayer [Wed, 14 Jan 2015 19:43:17 +0000 (20:43 +0100)]
fate: add qp filter test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 18 Sep 2013 23:57:55 +0000 (23:57 +0000)]
avfilter: port qp filter from libmpcodecs
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Sat, 10 Jan 2015 08:39:34 +0000 (09:39 +0100)]
id3v2: fix reading v2.2 attached pictures
In v2.2, the picture type is not a zero-terminated string, but has a
constant size of 3 bytes.
Anton Khirnov [Sat, 10 Jan 2015 08:39:33 +0000 (09:39 +0100)]
id3v2: add names to the parameters of ID3v2EMFunc.read
Some of them are not immediately obvious.
OSDN Git Service
