]> git.sesse.net Git - ffmpeg/log
ffmpeg
9 years agoavformat/mp3dec: offset seek index to end of id3v2 tag
wm4 [Tue, 31 Mar 2015 20:47:37 +0000 (22:47 +0200)]
avformat/mp3dec: offset seek index to end of id3v2 tag

The Xing index won't account for the id3 tag - it's relative to the
headers.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/libx265: export choosen picture types
Michael Niedermayer [Mon, 30 Mar 2015 22:37:46 +0000 (00:37 +0200)]
avcodec/libx265: export choosen picture types

Fixes part of ticket 4285

Reviewed-by Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agopng: Clear up the calculation of max packet size
Donny Yang [Tue, 31 Mar 2015 12:37:22 +0000 (12:37 +0000)]
png: Clear up the calculation of max packet size

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/internal: Fix doxy for ff_alloc_packet2() return value
Michael Niedermayer [Tue, 31 Mar 2015 14:14:22 +0000 (16:14 +0200)]
avcodec/internal: Fix doxy for ff_alloc_packet2() return value

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovf_drawtext: add support for setting box border width
Marton Balint [Mon, 30 Mar 2015 22:52:47 +0000 (00:52 +0200)]
vf_drawtext: add support for setting box border width

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/http: Fix null check on allocated value
Himangi Saraogi [Tue, 31 Mar 2015 07:23:25 +0000 (12:53 +0530)]
avformat/http: Fix null check on allocated value

probably fixes CID 1292299

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoh264: avoid unnecessary calls to get_format
Rainer Hochecker [Tue, 31 Mar 2015 06:27:01 +0000 (08:27 +0200)]
h264: avoid unnecessary calls to get_format

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/vf_detelecine: Fix uninitialized array index error
Himangi Saraogi [Tue, 31 Mar 2015 07:13:46 +0000 (12:43 +0530)]
avfilter/vf_detelecine: Fix uninitialized array index error

Fixes the defect CID 1292301

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf/segment: style nits
Rodger Combs [Tue, 31 Mar 2015 02:23:19 +0000 (20:23 -0600)]
lavf/segment: style nits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/snowenc: Check av_frame_ref() return value
Michael Niedermayer [Tue, 31 Mar 2015 02:25:42 +0000 (04:25 +0200)]
avcodec/snowenc: Check av_frame_ref() return value

Fixes CID1026740

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/h264_refs: fix null pointer dereference with -DTRACE
Michael Niedermayer [Mon, 30 Mar 2015 23:57:00 +0000 (01:57 +0200)]
avcodec/h264_refs: fix null pointer dereference with -DTRACE

Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8'
Michael Niedermayer [Mon, 30 Mar 2015 23:02:00 +0000 (01:02 +0200)]
Merge commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8'

* commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8':
  build: Split JPEG-related tables off into a separate component

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '87f87ccf32055aca25fa08e29e22cca1ba9976d5'
Michael Niedermayer [Mon, 30 Mar 2015 22:47:40 +0000 (00:47 +0200)]
Merge commit '87f87ccf32055aca25fa08e29e22cca1ba9976d5'

* commit '87f87ccf32055aca25fa08e29e22cca1ba9976d5':
  mjpeg: Use a more precise type for put_marker()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavutil/hmac: Check av_hmac_alloc() return code
Michael Niedermayer [Mon, 30 Mar 2015 21:07:19 +0000 (23:07 +0200)]
avutil/hmac: Check av_hmac_alloc() return code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoswresample/swresample: Use av_mallocz_array()
Michael Niedermayer [Mon, 30 Mar 2015 20:59:09 +0000 (22:59 +0200)]
swresample/swresample: Use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf: Bump minor version and document directory listing API in doc/APIchanges.
Mariusz SzczepaƄczyk [Sat, 28 Mar 2015 23:54:46 +0000 (00:54 +0100)]
lavf: Bump minor version and document directory listing API in doc/APIchanges.

9 years agoavcodec/libdcadec: remove av_assert and check bits_per_sample more completely
Michael Niedermayer [Sun, 29 Mar 2015 11:12:07 +0000 (13:12 +0200)]
avcodec/libdcadec: remove av_assert and check bits_per_sample more completely

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/vf_vignette: Change enum to int, which is accessed via AVOption as int
Michael Niedermayer [Mon, 30 Mar 2015 19:58:42 +0000 (21:58 +0200)]
avfilter/vf_vignette:  Change enum to int, which is accessed via AVOption as int

This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavdevice/avfoundation: Fix occured typo
Michael Niedermayer [Mon, 30 Mar 2015 19:41:17 +0000 (21:41 +0200)]
avdevice/avfoundation: Fix occured typo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'e6e3dcba0c6f11bd7022e2d3b9bcb7b6a09d6c80'
Michael Niedermayer [Mon, 30 Mar 2015 19:05:23 +0000 (21:05 +0200)]
Merge commit 'e6e3dcba0c6f11bd7022e2d3b9bcb7b6a09d6c80'

* commit 'e6e3dcba0c6f11bd7022e2d3b9bcb7b6a09d6c80':
  mjpeg: Move code only used in the encoder(s) to the appropriate header

Conflicts:
libavcodec/mjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '6ed38b1f65b424a4fa92042e0069f350b95e0098'
Michael Niedermayer [Mon, 30 Mar 2015 18:54:08 +0000 (20:54 +0200)]
Merge commit '6ed38b1f65b424a4fa92042e0069f350b95e0098'

* commit '6ed38b1f65b424a4fa92042e0069f350b95e0098':
  tiff: Return more meaningful error codes

Conflicts:
libavcodec/tiffenc.c

See: 0187c2ccda3b00d22797170bf5675318dd0f675a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '23944d29a22a2cd602753b3705f73011c3bf0b18'
Michael Niedermayer [Mon, 30 Mar 2015 18:39:01 +0000 (20:39 +0200)]
Merge commit '23944d29a22a2cd602753b3705f73011c3bf0b18'

* commit '23944d29a22a2cd602753b3705f73011c3bf0b18':
  indeo: Give Indeo4/5 shared code a more consistent name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '7d3183d3a4e800ab7a7fa24f49968a1b1bcc0161'
Michael Niedermayer [Mon, 30 Mar 2015 18:31:50 +0000 (20:31 +0200)]
Merge commit '7d3183d3a4e800ab7a7fa24f49968a1b1bcc0161'

* commit '7d3183d3a4e800ab7a7fa24f49968a1b1bcc0161':
  qsv: Skip header compilation depending on what parts of qsv are enabled

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agotiff: Return more meaningful error codes
Himangi Saraogi [Mon, 30 Mar 2015 16:54:06 +0000 (22:24 +0530)]
tiff: Return more meaningful error codes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agobuild: Split JPEG-related tables off into a separate component
Diego Biurrun [Fri, 27 Mar 2015 11:23:59 +0000 (12:23 +0100)]
build: Split JPEG-related tables off into a separate component

9 years agomjpeg: Use a more precise type for put_marker()
Diego Biurrun [Sun, 29 Mar 2015 11:24:18 +0000 (13:24 +0200)]
mjpeg: Use a more precise type for put_marker()

9 years agomjpeg: Move code only used in the encoder(s) to the appropriate header
Diego Biurrun [Fri, 27 Mar 2015 11:53:56 +0000 (12:53 +0100)]
mjpeg: Move code only used in the encoder(s) to the appropriate header

9 years agotiff: Return more meaningful error codes
Himangi Saraogi [Sun, 29 Mar 2015 18:57:56 +0000 (00:27 +0530)]
tiff: Return more meaningful error codes

Signed-off-by: Diego Biurrun <diego@biurrun.de>
9 years agoindeo: Give Indeo4/5 shared code a more consistent name
Diego Biurrun [Sun, 29 Mar 2015 12:44:23 +0000 (14:44 +0200)]
indeo: Give Indeo4/5 shared code a more consistent name

9 years agoqsv: Skip header compilation depending on what parts of qsv are enabled
Diego Biurrun [Sun, 29 Mar 2015 11:49:44 +0000 (13:49 +0200)]
qsv: Skip header compilation depending on what parts of qsv are enabled

9 years agolibavformat/mxfenc.c: Add 'Presentation Y offset' metadata
Tim Nicholson [Mon, 30 Mar 2015 10:11:17 +0000 (11:11 +0100)]
libavformat/mxfenc.c: Add 'Presentation Y offset' metadata

Previously unset, and some software mishandles files if it is absent

Signed-off-by: Tim Nicholson <tim.nicholson@bbc.co.uk>
Reviewed-by: tomas.hardin@codemill.se
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavutil/pca: Check for av_malloc* failures
Michael Niedermayer [Mon, 30 Mar 2015 02:37:42 +0000 (04:37 +0200)]
avutil/pca: Check for av_malloc* failures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/nutdec: Use av_malloc_array()
Michael Niedermayer [Mon, 30 Mar 2015 02:32:58 +0000 (04:32 +0200)]
avformat/nutdec: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/img2: Change enum to int, which is accessed via AVOption as int
Michael Niedermayer [Mon, 23 Mar 2015 18:31:17 +0000 (19:31 +0100)]
avformat/img2: Change enum to int, which is accessed via AVOption as int

This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/wavenc: Change enum to int, which is accessed via AVOption as int
Michael Niedermayer [Mon, 23 Mar 2015 18:31:17 +0000 (19:31 +0100)]
avformat/wavenc: Change enum to int, which is accessed via AVOption as int

This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/vf_transpose: Change enums to int, which are accessed via AVOption as int
Michael Niedermayer [Mon, 23 Mar 2015 18:31:17 +0000 (19:31 +0100)]
avfilter/vf_transpose: Change enums to int, which are accessed via AVOption as int

This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/tinterlace: Change enum to int, which is accessed via AVOption as int
Michael Niedermayer [Mon, 23 Mar 2015 18:31:17 +0000 (19:31 +0100)]
avfilter/tinterlace: Change enum to int, which is accessed via AVOption as int

This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/udp: Remove (harmless) duplicated pkt_size entry from AVOption table
Michael Niedermayer [Sun, 29 Mar 2015 20:10:05 +0000 (22:10 +0200)]
avformat/udp: Remove (harmless) duplicated pkt_size entry from AVOption table

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'ff7adead0a667e606f5a41dca591f074f9ff2f32'
Michael Niedermayer [Sun, 29 Mar 2015 20:05:13 +0000 (22:05 +0200)]
Merge commit 'ff7adead0a667e606f5a41dca591f074f9ff2f32'

* commit 'ff7adead0a667e606f5a41dca591f074f9ff2f32':
  udp: Fix pkt_size management

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf/segment: Mark output contexts as non-seekable when applicable
Rodger Combs [Sun, 29 Mar 2015 16:57:09 +0000 (10:57 -0600)]
lavf/segment: Mark output contexts as non-seekable when applicable

This prevents sub-muxers from trying to seek back to the beginning of the
whole stream, only to find themselves overwriting some video data in the
current (often last) segment.

We only do this when not writing individual header/trailers.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agopng: Only init zlib once
Donny Yang [Sun, 29 Mar 2015 11:05:43 +0000 (11:05 +0000)]
png: Only init zlib once

Signed-off-by: Donny Yang <work@kota.moe>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agopng: Calculate pixel format information only once
Donny Yang [Sun, 29 Mar 2015 11:05:42 +0000 (11:05 +0000)]
png: Calculate pixel format information only once

Signed-off-by: Donny Yang <work@kota.moe>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agopng: Return slightly more meaningful error codes
Donny Yang [Sun, 29 Mar 2015 11:05:42 +0000 (11:05 +0000)]
png: Return slightly more meaningful error codes

Signed-off-by: Donny Yang <work@kota.moe>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoudp: Fix pkt_size management
Luca Barbato [Sun, 29 Mar 2015 13:19:35 +0000 (15:19 +0200)]
udp: Fix pkt_size management

The default value for unset is -1, not 0.

Problem introduced in 66028b7ba6b411ba12ef553e9c8f1f4a4fe27710

Bug-Id: 835

9 years agolibavformat/segment: add an option to write the header to a separate file
Rodger Combs [Sun, 29 Mar 2015 01:25:20 +0000 (19:25 -0600)]
libavformat/segment: add an option to write the header to a separate file

This permits some interesting segmenting techniques with formats like Matroska,
where you can concatenate the header and segments [N, nb_segments) and get
a working file that starts at segment N's start time.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibavformat/segment: don't leave the list pb open when not in use
Rodger Combs [Sun, 29 Mar 2015 01:25:18 +0000 (19:25 -0600)]
libavformat/segment: don't leave the list pb open when not in use

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibavformat/hls: add an option to start from a given segment in a live stream
Rodger Combs [Sun, 29 Mar 2015 00:27:35 +0000 (18:27 -0600)]
libavformat/hls: add an option to start from a given segment in a live stream

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sun, 29 Mar 2015 11:19:46 +0000 (13:19 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavc/h264_refs: Fix compilation with -DTRACE.
  Fix make checkheaders if libmfx is not available.
  lavf/gif: Add an option max_gif_delay to limit the frame duration.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '72025ac36c740f031d7e413041fdfe97087c83c4'
Michael Niedermayer [Sun, 29 Mar 2015 10:47:10 +0000 (12:47 +0200)]
Merge commit '72025ac36c740f031d7e413041fdfe97087c83c4'

* commit '72025ac36c740f031d7e413041fdfe97087c83c4':
  lavc: add libdcadec decoder

Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/libdcadec.c

See: 519868de7d9c99876efcaf57d6a9683c22732cde
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavc/h264_refs: Fix compilation with -DTRACE.
Carl Eugen Hoyos [Sun, 29 Mar 2015 10:34:43 +0000 (12:34 +0200)]
lavc/h264_refs: Fix compilation with -DTRACE.

9 years agoFix make checkheaders if libmfx is not available.
Carl Eugen Hoyos [Sun, 29 Mar 2015 10:34:13 +0000 (12:34 +0200)]
Fix make checkheaders if libmfx is not available.

9 years agolavf/gif: Add an option max_gif_delay to limit the frame duration.
Carl Eugen Hoyos [Sun, 29 Mar 2015 03:14:48 +0000 (05:14 +0200)]
lavf/gif: Add an option max_gif_delay to limit the frame duration.

Allows playback for the sample from ticket #4369 in less than 18 hours.

9 years agoMerge commit '6fe2641d6e410b7bc203138fa97e1118b411f16d'
Michael Niedermayer [Sun, 29 Mar 2015 10:21:24 +0000 (12:21 +0200)]
Merge commit '6fe2641d6e410b7bc203138fa97e1118b411f16d'

* commit '6fe2641d6e410b7bc203138fa97e1118b411f16d':
  lavc: add profile define for DTS Express

Conflicts:
doc/APIchanges
libavcodec/version.h

See: 11fe56c8bbf39cd0c3edbf0cd404dea400ff7e0c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'c48456166e95648719a8be8f8613f9dee98205c1'
Michael Niedermayer [Sun, 29 Mar 2015 09:32:24 +0000 (11:32 +0200)]
Merge commit 'c48456166e95648719a8be8f8613f9dee98205c1'

* commit 'c48456166e95648719a8be8f8613f9dee98205c1':
  lavc: add MMAL hardware decoder wrapper

Conflicts:
Changelog
configure
doc/APIchanges
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavc: add libdcadec decoder
Hendrik Leppkes [Mon, 23 Mar 2015 11:45:19 +0000 (12:45 +0100)]
lavc: add libdcadec decoder

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agolavc: add profile define for DTS Express
Hendrik Leppkes [Mon, 23 Mar 2015 11:45:18 +0000 (12:45 +0100)]
lavc: add profile define for DTS Express

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agolavc: add MMAL hardware decoder wrapper
wm4 [Fri, 27 Mar 2015 22:04:08 +0000 (23:04 +0100)]
lavc: add MMAL hardware decoder wrapper

Based on a patch by Rodger Combs.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agolibavdevice/avfoundation: use pts/dts provided by the CMSampleBuffer API
Matthieu Bouron [Fri, 13 Mar 2015 19:16:55 +0000 (20:16 +0100)]
libavdevice/avfoundation: use pts/dts provided by the CMSampleBuffer API

Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibavdevice/avfoundation: add capture_mouse_clicks option
Matthieu Bouron [Sat, 7 Mar 2015 21:10:34 +0000 (22:10 +0100)]
libavdevice/avfoundation: add capture_mouse_clicks option

Support mouse clicks capture while recording a screen on OSX >= 10.7.

Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibavdevice/avfoundation: add capture_cursor option
Matthieu Bouron [Sat, 7 Mar 2015 21:01:03 +0000 (22:01 +0100)]
libavdevice/avfoundation: add capture_cursor option

Add support for cursor capturing while recording a screen for OSX >=
10.8.

Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibavdevice/avfoundation: add framerate and video size options
Matthieu Bouron [Sat, 7 Mar 2015 20:26:52 +0000 (21:26 +0100)]
libavdevice/avfoundation: add framerate and video size options

Support framerate ands video size options on AVCaptureDevices for
OSX >= 10.7 and iOS >= 7.0.

For screen captures, only the framerate option is taken into account.

Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg_opt: Do not overwrite output if there is no input
Michael Niedermayer [Thu, 26 Mar 2015 23:42:26 +0000 (00:42 +0100)]
ffmpeg_opt: Do not overwrite output if there is no input

Fixes Ticket4254

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavc/dnxhd: Fix pix_fmt change.
Carl Eugen Hoyos [Sat, 28 Mar 2015 16:36:02 +0000 (17:36 +0100)]
lavc/dnxhd: Fix pix_fmt change.

Fixes ticket #4400.

9 years agopng: Minor whitespace change and added missing comment
Donny Yang [Sat, 28 Mar 2015 15:14:22 +0000 (15:14 +0000)]
png: Minor whitespace change and added missing comment

Signed-off-by: Donny Yang <work@kota.moe>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agopng: Use av_freep() instead of av_free()
Donny Yang [Sat, 28 Mar 2015 15:14:21 +0000 (15:14 +0000)]
png: Use av_freep() instead of av_free()

Signed-off-by: Donny Yang <work@kota.moe>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agofate/filter-video: Use qp filter to generate non constant qp array for more throughou...
Michael Niedermayer [Sat, 28 Mar 2015 14:29:56 +0000 (15:29 +0100)]
fate/filter-video: Use qp filter to generate non constant qp array for more throughout testing of the pp filter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovfilter/vf_qp: Support evaluating expression per MB
Michael Niedermayer [Sat, 28 Mar 2015 14:18:58 +0000 (15:18 +0100)]
vfilter/vf_qp: Support evaluating expression per MB

also add support for x/y/w/h parameters

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/vf_qp: split expression parsing out of loop
Michael Niedermayer [Sat, 28 Mar 2015 14:17:36 +0000 (15:17 +0100)]
avfilter/vf_qp: split expression parsing out of loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoaf_channelmap: fix number of channels
Marton Balint [Sat, 28 Mar 2015 09:07:07 +0000 (10:07 +0100)]
af_channelmap: fix number of channels

Fixes segfaults with the following command:

ffmpeg -f lavfi -i aevalsrc=0:c=stereo:n=1920 -af 'channelmap=0' test.ac3

Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/qsv_internal: Fix project name
Michael Niedermayer [Sat, 28 Mar 2015 02:42:29 +0000 (03:42 +0100)]
avcodec/qsv_internal: Fix project name

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodoc/examples: add directory listing example
Lukasz Marek [Sat, 5 Jul 2014 16:12:04 +0000 (18:12 +0200)]
doc/examples: add directory listing example

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agopostproc: Removed unecessary if/else branch when getting QP.
Tucker DiNapoli [Fri, 27 Mar 2015 20:51:43 +0000 (16:51 -0400)]
postproc: Removed unecessary if/else branch when getting QP.

There's still an if, as QP needs to be modified if isColor=0, but it
still removes a unecessary branch.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2'
Michael Niedermayer [Sat, 28 Mar 2015 00:33:27 +0000 (01:33 +0100)]
Merge commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2'

* commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2':
  lavc: add Intel libmfx-based H.264 encoder

Conflicts:
Changelog
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '9ba27c2348d26000257e891e40a72facb0d916be'
Michael Niedermayer [Sat, 28 Mar 2015 00:25:16 +0000 (01:25 +0100)]
Merge commit '9ba27c2348d26000257e891e40a72facb0d916be'

* commit '9ba27c2348d26000257e891e40a72facb0d916be':
  qsvdec: add 'decode' to the non-static function names

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791'
Michael Niedermayer [Sat, 28 Mar 2015 00:16:21 +0000 (01:16 +0100)]
Merge commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791'

* commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791':
  qsvdec: split off some code that will be shared with the encoder

Conflicts:
libavcodec/Makefile
libavcodec/qsvdec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1'
Michael Niedermayer [Sat, 28 Mar 2015 00:03:23 +0000 (01:03 +0100)]
Merge commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1'

* commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1':
  qsv: rename to qsvdec

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agofate: Use a variable QP input for fate-filter-pp
Michael Niedermayer [Fri, 27 Mar 2015 23:25:18 +0000 (00:25 +0100)]
fate: Use a variable QP input for fate-filter-pp

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agofate: simplify filter-pp tests
Michael Niedermayer [Fri, 27 Mar 2015 23:16:24 +0000 (00:16 +0100)]
fate: simplify filter-pp tests

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavc: add Intel libmfx-based H.264 encoder
Anton Khirnov [Fri, 13 Mar 2015 09:20:31 +0000 (10:20 +0100)]
lavc: add Intel libmfx-based H.264 encoder

9 years agoqsvdec: add 'decode' to the non-static function names
Anton Khirnov [Fri, 13 Mar 2015 07:21:38 +0000 (08:21 +0100)]
qsvdec: add 'decode' to the non-static function names

9 years agoqsvdec: split off some code that will be shared with the encoder
Anton Khirnov [Fri, 13 Mar 2015 07:13:00 +0000 (08:13 +0100)]
qsvdec: split off some code that will be shared with the encoder

9 years agoqsv: rename to qsvdec
Anton Khirnov [Fri, 13 Mar 2015 06:55:53 +0000 (07:55 +0100)]
qsv: rename to qsvdec

This is to avoid conflicts with the upcoming QSV encoding support.

9 years agoavformat/avio: Document the end of list case in avio_read_dir()
Michael Niedermayer [Fri, 27 Mar 2015 20:17:30 +0000 (21:17 +0100)]
avformat/avio: Document the end of list case in avio_read_dir()

This was mentioned in a previous review

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavfi: add inverse telecine filter
Himangi Saraogi [Fri, 27 Mar 2015 14:06:05 +0000 (19:36 +0530)]
lavfi: add inverse telecine filter

Approved-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf: add directory listing API
Lukasz Marek [Sat, 5 Jul 2014 16:11:59 +0000 (18:11 +0200)]
lavf: add directory listing API

API allows protocol implementations to provide API that
allows to list directory content.
API is similar to POSIX opendir/readdir/closedir.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/vf_telecine: Avoid floating point values
Himangi Saraogi [Fri, 27 Mar 2015 14:05:12 +0000 (19:35 +0530)]
avfilter/vf_telecine: Avoid floating point values

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavutil/timer: give each printed value of STOP_TIMER a fixed length
Michael Niedermayer [Sun, 22 Mar 2015 15:15:03 +0000 (16:15 +0100)]
avutil/timer: give each printed value of STOP_TIMER a fixed length

this makes the result easier to read

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavutil/timer: show histogram of cpu cycles each run took
Michael Niedermayer [Sun, 22 Mar 2015 15:11:08 +0000 (16:11 +0100)]
avutil/timer: show histogram of cpu cycles each run took

The new information is printed at verbose log level and can thus be switched on and off
through the log level

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavutil/cpu: add missing check for mmxext to av_force_cpu_flags
James Almer [Thu, 26 Mar 2015 05:11:55 +0000 (02:11 -0300)]
avutil/cpu: add missing check for mmxext to av_force_cpu_flags

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
9 years agoavfilter/vf_telecine: Fix loss of AVFrame properties in output
Himangi Saraogi [Thu, 26 Mar 2015 23:04:39 +0000 (04:34 +0530)]
avfilter/vf_telecine: Fix loss of AVFrame properties in output

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/x86/hpeldsp_init: Put CONFIG_* first in if()
Michael Niedermayer [Thu, 26 Mar 2015 14:30:20 +0000 (15:30 +0100)]
avcodec/x86/hpeldsp_init: Put CONFIG_* first in if()

This is more consistent and may fix a build failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/h264_slice: Put CONFIG_GRAY first in if()
Michael Niedermayer [Thu, 26 Mar 2015 14:30:20 +0000 (15:30 +0100)]
avcodec/h264_slice: Put CONFIG_GRAY first in if()

This is more consistent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/arm/flacdsp_init_arm: Put CONFIG_FLAC_DECODER first in if()
Michael Niedermayer [Thu, 26 Mar 2015 14:29:54 +0000 (15:29 +0100)]
avcodec/arm/flacdsp_init_arm: Put CONFIG_FLAC_DECODER first in if()

This is more consistent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/ac3dec: Put CONFIG* first in if()
Michael Niedermayer [Thu, 26 Mar 2015 14:29:03 +0000 (15:29 +0100)]
avcodec/ac3dec: Put CONFIG* first in if()

This may fix build failures with EAC3 disabled and is more consistent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/dv: fix used dimension variables
Michael Niedermayer [Thu, 26 Mar 2015 02:10:27 +0000 (03:10 +0100)]
avformat/dv: fix used dimension variables

Fixes null pointer dereference during seeking
Fixes Ticket4395

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/rmdec: fix support for 0 sized mdpr
Michael Niedermayer [Thu, 26 Mar 2015 01:02:18 +0000 (02:02 +0100)]
avformat/rmdec: fix support for 0 sized mdpr

Fixes Ticket4393

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/vf_telecine: Fix AV desync by using the first input timestamp
Himangi Saraogi [Wed, 25 Mar 2015 23:05:28 +0000 (04:35 +0530)]
avfilter/vf_telecine: Fix AV desync by using the first input timestamp

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/nvenc: Need a separate class for each encoder
Philip Langdale [Wed, 25 Mar 2015 22:24:30 +0000 (15:24 -0700)]
avcodec/nvenc: Need a separate class for each encoder

The encoders can't share a class instance.

Signed-off-by: Philip Langdale <philipl@overt.org>
9 years agodoc: remove the reference to supporting AviSynth 2.5
Stephen Hutchinson [Tue, 24 Mar 2015 19:23:31 +0000 (15:23 -0400)]
doc: remove the reference to supporting AviSynth 2.5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavisynth: drop support of AviSynth 2.5
Stephen Hutchinson [Tue, 24 Mar 2015 19:23:30 +0000 (15:23 -0400)]
avisynth: drop support of AviSynth 2.5

If the user attempts to use AviSynth 2.5, an error message will
now tell them they need to upgrade.

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