]>
git.sesse.net Git - ffmpeg/log
Anton Khirnov [Sun, 4 Aug 2013 14:38:25 +0000 (16:38 +0200)]
avconv: fix usage of deprecated lavfi API
James Almer [Fri, 26 Jul 2013 05:56:19 +0000 (02:56 -0300)]
fate: Add vorbiscomment cover art test
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 5 Aug 2013 08:15:03 +0000 (10:15 +0200)]
avcodec/tta: use init_get_bits8()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 5 Aug 2013 08:14:42 +0000 (10:14 +0200)]
avformat/takdec: use init_get_bits8()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 5 Aug 2013 08:14:14 +0000 (10:14 +0200)]
avcodec/eatgq: use init_get_bits8()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 5 Aug 2013 08:13:48 +0000 (10:13 +0200)]
avcodec/diracdec: use init_get_bits8()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 5 Aug 2013 08:13:21 +0000 (10:13 +0200)]
avcodec/ra144dec: use init_get_bits8()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 5 Aug 2013 08:12:46 +0000 (10:12 +0200)]
avformat/latmenc: use init_get_bits8()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 5 Aug 2013 07:57:07 +0000 (09:57 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mxfenc: switch to av_reallocp_array() and check allocation errors
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 5 Aug 2013 07:52:06 +0000 (09:52 +0200)]
Merge commit '
a10c4ce24bd4a0dd557d5849aa53a0cc74677808 '
* commit '
a10c4ce24bd4a0dd557d5849aa53a0cc74677808 ':
aac: Forward errors properly in aac_decode_frame_int
Conflicts:
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 5 Aug 2013 07:45:29 +0000 (09:45 +0200)]
Merge commit '
71953ebcf94fe4ef316cdad1f276089205dd1d65 '
* commit '
71953ebcf94fe4ef316cdad1f276089205dd1d65 ':
aac: Check init_get_bits return value
Conflicts:
libavcodec/aacdec.c
See:
73abc3a634d84e4cc8951787323b594c5476e4a8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 5 Aug 2013 07:32:31 +0000 (09:32 +0200)]
Merge commit '
51fc88e7467169031b20b9983d80456b893a9fa3 '
* commit '
51fc88e7467169031b20b9983d80456b893a9fa3 ':
avconv: improve some variable names
Conflicts:
ffmpeg_filter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 5 Aug 2013 07:21:53 +0000 (09:21 +0200)]
Merge commit '
77cc958f60f73963be4281d6e82ef81707e40c26 '
* commit '
77cc958f60f73963be4281d6e82ef81707e40c26 ':
lavfi: add const to the AVFilter parameter of avfilter_graph_create_filter()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 5 Aug 2013 00:53:16 +0000 (02:53 +0200)]
rdt: make const tables static const
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 5 Aug 2013 00:52:41 +0000 (02:52 +0200)]
mp3dec: make const tables static const
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 4 Aug 2013 20:52:10 +0000 (22:52 +0200)]
avcodec/fft: Fix "warning: unused variable"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 4 Aug 2013 19:18:49 +0000 (21:18 +0200)]
avformat/matroskadec: make sipr_bit_rate static const
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Sun, 4 Aug 2013 16:47:22 +0000 (18:47 +0200)]
avserver: do not use a static string as a default for a string option
Fixes an invalid free.
Bug-id: 448
Alexandra Khirnova [Fri, 2 Aug 2013 17:21:24 +0000 (19:21 +0200)]
mxfenc: switch to av_reallocp_array() and check allocation errors
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Luca Barbato [Sun, 4 Aug 2013 13:14:25 +0000 (15:14 +0200)]
aac: Forward errors properly in aac_decode_frame_int
Incidentally also remove a warning.
Luca Barbato [Sun, 4 Aug 2013 13:00:02 +0000 (15:00 +0200)]
aac: Check init_get_bits return value
Some code paths can call it with invalid length.
CC: libav-stable@libav.org
Anton Khirnov [Fri, 14 Jun 2013 16:12:23 +0000 (18:12 +0200)]
avconv: improve some variable names
'filter' is too generic, since the functions in question deal with
several filters.
Also add const qualifiers to those variables.
Anton Khirnov [Fri, 14 Jun 2013 16:14:33 +0000 (18:14 +0200)]
lavfi: add const to the AVFilter parameter of avfilter_graph_create_filter()
This function should never modify the filter.
Nedeljko Babic [Mon, 3 Jun 2013 14:11:12 +0000 (16:11 +0200)]
libavcodec: Implementation of 32 bit fixed point FFT
Iterative implementation of 32 bit fixed point split-radix FFT.
Max FFT that can be calculated currently is 2^12.
Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andrey Utkin [Sun, 4 Aug 2013 09:25:57 +0000 (12:25 +0300)]
doc/muxers: Document use case of mpegts muxer option tables_version
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Sat, 3 Aug 2013 23:30:00 +0000 (16:30 -0700)]
vf_scale: add force_original_aspect_ratio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 4 Aug 2013 09:24:57 +0000 (11:24 +0200)]
MAINTAINERS: order libavutil entries alphabetically
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 3 Aug 2013 22:56:55 +0000 (00:56 +0200)]
avfilter/graphparser: remove 256 char limit from create_filter()
Fixes Ticket2803
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 3 Aug 2013 20:24:31 +0000 (22:24 +0200)]
avdevice/vfwcap: make constant arrays static
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 3 Aug 2013 20:24:11 +0000 (22:24 +0200)]
avdevice/dshow: make constant arrays static
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 3 Aug 2013 20:22:03 +0000 (22:22 +0200)]
doc/examples/filtering_audio: make const arrays also static
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andrey Utkin [Sat, 3 Aug 2013 14:59:25 +0000 (17:59 +0300)]
doc/muxers: Document previously undocumented mpegts muxer options
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 3 Aug 2013 16:54:43 +0000 (18:54 +0200)]
avfilter: fix plane validity checks
Fixes out of array accesses
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 3 Aug 2013 14:13:03 +0000 (16:13 +0200)]
avdevice/timefilter: 2nd try at avoiding rounding issues
This hopefully fixes fate-timefilter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 3 Aug 2013 14:09:51 +0000 (16:09 +0200)]
avdevice/timefilter-test: provide more space for the printout to allow larger values
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sun, 28 Jul 2013 22:49:44 +0000 (00:49 +0200)]
avcodec/pnmdec: support more pnm files
Fixes Ticket1897
Some hunks that have become unneeded due to previous changes removed by the commiter.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 3 Aug 2013 12:14:55 +0000 (14:14 +0200)]
pnmdec: always output native pixel format
This simplifies the code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andrey Utkin [Fri, 2 Aug 2013 19:08:05 +0000 (22:08 +0300)]
mpegtsenc: add option tables_version
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 3 Aug 2013 10:36:56 +0000 (12:36 +0200)]
MAINTAINERS: add myself as maintainer for the interface code to swresample & swscale in libavfilter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 3 Aug 2013 08:53:44 +0000 (10:53 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Check for GCC diagnostic pragma support inside of functions
This commit was cherry picked previously already to prevent compilation failure on a previous merge
See:
038c4f65ee6c72f9d1ee4d4e46c74073992fabc8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 3 Aug 2013 08:48:11 +0000 (10:48 +0200)]
Merge commit '
a8b19271c3b40ac3c3dc769fe248887acf14ba5a '
* commit '
a8b19271c3b40ac3c3dc769fe248887acf14ba5a ':
avcodec: Add output_picture_number to AVCodecParserContext
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 3 Aug 2013 08:27:42 +0000 (10:27 +0200)]
avcodec/mlp: Fix bugs in libavs warning fixes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 3 Aug 2013 08:08:30 +0000 (10:08 +0200)]
Merge commit '
7950e519bb094897f957b9a9531cc60ba46cbc91 '
* commit '
7950e519bb094897f957b9a9531cc60ba46cbc91 ':
Disable deprecation warnings for cases where a replacement is available
Conflicts:
libavcodec/avpacket.c
libavcodec/pthread.c
libavcodec/utils.c
libavdevice/v4l2.c
libavfilter/avfiltergraph.c
libavfilter/buffersrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Fri, 2 Aug 2013 20:03:09 +0000 (22:03 +0200)]
configure: Check for GCC diagnostic pragma support inside of functions
The actual usage of the pragma is within functions and older versions
of gcc only support the pragma outside of functions.
Michael Niedermayer [Sat, 3 Aug 2013 07:27:37 +0000 (09:27 +0200)]
Merge commit '
3a7050ffed5ce061b114a11e4de4b77aba8efa0b '
* commit '
3a7050ffed5ce061b114a11e4de4b77aba8efa0b ':
build: Add _Pragma macro to disable deprecated declaration warnings
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 3 Aug 2013 07:22:24 +0000 (09:22 +0200)]
Merge commit '
79be2c325c5ee8f7ac9e28399e51986ebe99bb3c '
* commit '
79be2c325c5ee8f7ac9e28399e51986ebe99bb3c ':
doc/print_options: Move options headers to a saner place
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 3 Aug 2013 07:16:36 +0000 (09:16 +0200)]
Merge commit '
b5a138652ff8a5b987d3e1191e67fd9f6575527e '
* commit '
b5a138652ff8a5b987d3e1191e67fd9f6575527e ':
Give less generic names to global library option arrays
Conflicts:
libavcodec/options_table.h
libavfilter/avfilter.c
libavformat/options_table.h
libswscale/options.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 3 Aug 2013 07:01:48 +0000 (09:01 +0200)]
Merge commit '
0d6fa3977b016f1b72b0b24b8834ff9222498548 '
* commit '
0d6fa3977b016f1b72b0b24b8834ff9222498548 ':
rtmp: Add seek support
Conflicts:
Changelog
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 3 Aug 2013 06:54:54 +0000 (08:54 +0200)]
Merge commit '
0d8b943d204bd16fcf2f4a59c742e65a401dd3d0 '
* commit '
0d8b943d204bd16fcf2f4a59c742e65a401dd3d0 ':
h264_sei: Return meaningful values
Conflicts:
libavcodec/h264_sei.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Aug 2013 22:45:02 +0000 (00:45 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Forward interlaced field information from mov to ffv1 decoder.
Do not suggest to use gas-preprocessor if using it would break compilation.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Tim.Nicholson [Fri, 2 Aug 2013 21:31:40 +0000 (23:31 +0200)]
Forward interlaced field information from mov to ffv1 decoder.
Only read the information for old ffv1, level/version 3 saves
the information in the bitstream.
Fixes a part of ticket #2190.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Carl Eugen Hoyos [Fri, 2 Aug 2013 21:23:58 +0000 (23:23 +0200)]
Do not suggest to use gas-preprocessor if using it would break compilation.
gas-preprocessor does not work on ppc with pic and on ppc64.
Michael Niedermayer [Fri, 2 Aug 2013 21:12:26 +0000 (23:12 +0200)]
avcodec/mdec: make block_index static const
Michael Niedermayer [Fri, 2 Aug 2013 21:11:58 +0000 (23:11 +0200)]
avcodec/mjpeg: make 2 outcommented tables static
Michael Niedermayer [Fri, 2 Aug 2013 21:11:31 +0000 (23:11 +0200)]
avcodec/dxtory: make def_lru[8] static
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Aug 2013 21:10:42 +0000 (23:10 +0200)]
avcodec/dnxhdenc: make header_prefix static const
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Fri, 2 Aug 2013 20:03:09 +0000 (22:03 +0200)]
configure: Check for GCC diagnostic pragma support inside of functions
The actual usage of the pragma is within functions and older versions
of gcc only support the pragma outside of functions.
Michael Niedermayer [Fri, 2 Aug 2013 19:14:25 +0000 (21:14 +0200)]
avformat/matroskaenc: make 2 tables static that are not used outside matroskaenc
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Aug 2013 19:09:54 +0000 (21:09 +0200)]
movenc: make uuids static const
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Yusuke Nakamura [Fri, 2 Aug 2013 09:16:48 +0000 (18:16 +0900)]
avcodec: Add output_picture_number to AVCodecParserContext
Set output_picture_number in H.264 parser.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diego Biurrun [Wed, 27 Mar 2013 17:36:51 +0000 (18:36 +0100)]
Disable deprecation warnings for cases where a replacement is available
Diego Biurrun [Wed, 27 Mar 2013 17:23:01 +0000 (18:23 +0100)]
build: Add _Pragma macro to disable deprecated declaration warnings
Diego Biurrun [Thu, 1 Aug 2013 12:41:34 +0000 (14:41 +0200)]
doc/print_options: Move options headers to a saner place
Diego Biurrun [Thu, 1 Aug 2013 12:35:01 +0000 (14:35 +0200)]
Give less generic names to global library option arrays
Gavriloaie Eugen-Andrei [Fri, 2 Aug 2013 09:29:23 +0000 (12:29 +0300)]
rtmp: Add seek support
Signed-off-by: Martin Storsjö <martin@martin.st>
Paul B Mahol [Fri, 2 Aug 2013 16:45:58 +0000 (16:45 +0000)]
ttaenc: fix packet size
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Vittorio Giovara [Fri, 2 Aug 2013 08:33:00 +0000 (10:33 +0200)]
h264_sei: Return meaningful values
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Fri, 2 Aug 2013 14:59:03 +0000 (16:59 +0200)]
avdevice/timefilter-test: dont try to optimize par1 for n0=0 case
for the n0=0 case there are multiple solutions and different
platforms pick different ones
This should reduce the issues with fate and the timefilter test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Aug 2013 11:05:16 +0000 (13:05 +0200)]
flvdec: silence unused warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Aug 2013 10:37:37 +0000 (12:37 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264_sei: K&R formatting cosmetics
Conflicts:
libavcodec/h264_sei.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Aug 2013 10:23:47 +0000 (12:23 +0200)]
Merge commit '
4c7fd58f8ae729b964b6859eace5ab9a55ce3c8c '
* commit '
4c7fd58f8ae729b964b6859eace5ab9a55ce3c8c ':
h264_sei: Remove pointless old comment
twinvq: Add proper twinvq prefixes to identifiers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Aug 2013 10:18:48 +0000 (12:18 +0200)]
Merge commit '
f900f35ac8db4ac30df6fda1c27502c2ef9e6ba5 '
* commit '
f900f35ac8db4ac30df6fda1c27502c2ef9e6ba5 ':
flvdec: Eliminate completely silly goto
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Aug 2013 10:07:20 +0000 (12:07 +0200)]
Merge commit '
e4529df944616917ae8462f5102253ff7f983093 '
* commit '
e4529df944616917ae8462f5102253ff7f983093 ':
flvdec: K&R formatting cosmetics
Conflicts:
libavformat/flvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Aug 2013 08:45:10 +0000 (10:45 +0200)]
Merge commit '
390b4d7088b5cecace245fee0c54a57e24dabdf4 '
* commit '
390b4d7088b5cecace245fee0c54a57e24dabdf4 ':
flvdec: Fix = vs. == typo in sample rate check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Aug 2013 08:39:37 +0000 (10:39 +0200)]
Merge commit '
fd8f91e3f44a2bdbefaaebead388133c5fdd3423 '
* commit '
fd8f91e3f44a2bdbefaaebead388133c5fdd3423 ':
rtsp: Simplify code for forming the remote peer url
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 23 Jul 2013 19:59:01 +0000 (21:59 +0200)]
jpeg2000dec: simplify jpeg2000_read_bitstream_packets()
23 lines less
less error prone as theres no more need to update *_size on every read
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Aug 2013 01:45:02 +0000 (03:45 +0200)]
avcodec/wmaenc: change commented assert to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Marton Balint [Sat, 27 Jul 2013 19:14:45 +0000 (21:14 +0200)]
mpegts: save last pcr of pcr pids in PES Context
Based on a patch by Reimar Döffinger.
http://lists.ffmpeg.org/pipermail/ffmpeg-devel/2012-September/131610.html
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Wed, 31 Jul 2013 02:41:32 +0000 (19:41 -0700)]
libxvid: cosmetics: Realign the code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Thu, 1 Aug 2013 19:14:48 +0000 (21:14 +0200)]
ffmpeg: raise level for message printed in case of auto-select pixel format
Increase visibility, in order to decrease troubleshooting for
users generating non playable H.264 content.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Carl Eugen Hoyos [Thu, 1 Aug 2013 14:21:31 +0000 (16:21 +0200)]
lavf/movenc: Write disc number and total number of discs as part of metadata.
Fixes ticket #2731.
Carl Eugen Hoyos [Thu, 1 Aug 2013 14:20:58 +0000 (16:20 +0200)]
lavf/movenc: Write total number of tracks as part of metadata.
Fixes ticket #2157.
Michael Niedermayer [Thu, 1 Aug 2013 11:59:47 +0000 (13:59 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avframe: have av_frame_get_side_data take const AVFrame*
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 1 Aug 2013 11:51:37 +0000 (13:51 +0200)]
Merge commit '
ee37d5811caa8f4ad125a37fe6ce3f9e66cd72f2 '
* commit '
ee37d5811caa8f4ad125a37fe6ce3f9e66cd72f2 ':
rtpproto: Allow specifying a separate rtcp port in ff_rtp_set_remote_url
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Wed, 31 Jul 2013 08:13:22 +0000 (10:13 +0200)]
h264_sei: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diego Biurrun [Wed, 31 Jul 2013 16:07:53 +0000 (18:07 +0200)]
h264_sei: Remove pointless old comment
Michael Niedermayer [Thu, 1 Aug 2013 11:24:53 +0000 (13:24 +0200)]
Merge commit '
1851e1d05d06f6ef3436c667e4354da0f407b226 '
* commit '
1851e1d05d06f6ef3436c667e4354da0f407b226 ':
rtpproto: Check the size before reading buf[1]
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 1 Aug 2013 11:16:56 +0000 (13:16 +0200)]
Merge commit '
7748dd41be3d6dd6300f14263586af4ee104ead2 '
* commit '
7748dd41be3d6dd6300f14263586af4ee104ead2 ':
avconv: add -n option to immediately exit when output files already exist
Conflicts:
Changelog
doc/ffmpeg.texi
ffmpeg_opt.c
See:
0a4f02117b67c135a27e3490aea1631ad9f4312f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 1 Aug 2013 10:46:38 +0000 (12:46 +0200)]
Merge commit '
b85dbe68e222586fd77332716eb8ed5724db4e1b '
* commit '
b85dbe68e222586fd77332716eb8ed5724db4e1b ':
avconv: Call exit_program instead of exit in avconv_opt as well
Conflicts:
ffmpeg_opt.c
See:
eeddeb6579d8133871dc15f989ab8ffec5b5b396
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 30 Jul 2013 17:42:21 +0000 (19:42 +0200)]
twinvq: Add proper twinvq prefixes to identifiers
Diego Biurrun [Wed, 31 Jul 2013 21:56:26 +0000 (23:56 +0200)]
flvdec: Eliminate completely silly goto
Diego Biurrun [Wed, 31 Jul 2013 22:10:40 +0000 (00:10 +0200)]
flvdec: K&R formatting cosmetics
Diego Biurrun [Wed, 31 Jul 2013 21:59:05 +0000 (23:59 +0200)]
flvdec: Fix = vs. == typo in sample rate check
Michael Niedermayer [Thu, 1 Aug 2013 10:30:30 +0000 (12:30 +0200)]
Merge commit '
c7e921a54ffe7feb9f695c82f0a0764ab8d0f62b '
* commit '
c7e921a54ffe7feb9f695c82f0a0764ab8d0f62b ':
avopt: Check whether the object actually has got an AVClass
Conflicts:
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 1 Aug 2013 10:02:33 +0000 (12:02 +0200)]
Merge commit '
b7e6da988bfd5def40ccf3476eb8ce2f98a969a5 '
* commit '
b7e6da988bfd5def40ccf3476eb8ce2f98a969a5 ':
rtpproto: Move rtpproto specific function declarations to a separate header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 1 Aug 2013 09:58:13 +0000 (11:58 +0200)]
Merge commit '
892b0be1dfbdeaf71235fb6c593286e4f5c7e4ec '
* commit '
892b0be1dfbdeaf71235fb6c593286e4f5c7e4ec ':
rtpproto: Simplify the rtp_read function by looping over the fds
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 1 Aug 2013 09:53:49 +0000 (11:53 +0200)]
Merge commit '
7531588fffbca1f0afdcc06635999c00dfc16ca6 '
* commit '
7531588fffbca1f0afdcc06635999c00dfc16ca6 ':
rtpproto: Remove a misplaced comment
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 1 Aug 2013 09:47:35 +0000 (11:47 +0200)]
Merge commit '
54e03ff6af8a070f1055edd26028f3f7b2e2ca8e '
* commit '
54e03ff6af8a070f1055edd26028f3f7b2e2ca8e ':
rtpproto: Support nonblocking reads
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 1 Aug 2013 09:42:25 +0000 (11:42 +0200)]
Merge commit '
2e814d0329aded98c811d0502839618f08642685 '
* commit '
2e814d0329aded98c811d0502839618f08642685 ':
rtpenc: Simplify code by introducing a macro for rescaling NTP timestamps
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 1 Aug 2013 09:36:54 +0000 (11:36 +0200)]
Merge commit '
45dd1ae1b3c18331f3db2293a9135bc5851e553f '
* commit '
45dd1ae1b3c18331f3db2293a9135bc5851e553f ':
avfilter: Add some missing FF_API_AVFILTERBUFFER ifdefs
Conflicts:
libavfilter/buffer.c
libavfilter/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>