ffmpeg.git
6 years agoavfilter: fix plane validity checks
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>
6 years agoavdevice/timefilter: 2nd try at avoiding rounding issues
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>
6 years agoavdevice/timefilter-test: provide more space for the printout to allow larger values
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>
6 years agoavcodec/pnmdec: support more pnm files
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>
6 years agopnmdec: always output native pixel format
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>
6 years agompegtsenc: add option tables_version
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>
6 years agoMAINTAINERS: add myself as maintainer for the interface code to swresample & swscale...
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>
6 years agoMerge remote-tracking branch 'qatar/master'
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>
6 years agoMerge commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a'
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>
6 years agoavcodec/mlp: Fix bugs in libavs warning fixes
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>
6 years agoMerge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'
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>
6 years agoconfigure: Check for GCC diagnostic pragma support inside of functions
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.

6 years agoMerge commit '3a7050ffed5ce061b114a11e4de4b77aba8efa0b'
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>
6 years agoMerge commit '79be2c325c5ee8f7ac9e28399e51986ebe99bb3c'
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>
6 years agoMerge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e'
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>
6 years agoMerge commit '0d6fa3977b016f1b72b0b24b8834ff9222498548'
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>
6 years agoMerge commit '0d8b943d204bd16fcf2f4a59c742e65a401dd3d0'
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>
6 years agoMerge remote-tracking branch 'cehoyos/master'
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>
6 years agoForward interlaced field information from mov to ffv1 decoder.
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>
6 years agoDo not suggest to use gas-preprocessor if using it would break compilation.
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.

6 years agoavcodec/mdec: make block_index static const
Michael Niedermayer [Fri, 2 Aug 2013 21:12:26 +0000 (23:12 +0200)]
avcodec/mdec: make block_index static const

6 years agoavcodec/mjpeg: make 2 outcommented tables static
Michael Niedermayer [Fri, 2 Aug 2013 21:11:58 +0000 (23:11 +0200)]
avcodec/mjpeg: make 2 outcommented tables static

6 years agoavcodec/dxtory: make def_lru[8] 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>
6 years agoavcodec/dnxhdenc: make header_prefix static const
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>
6 years agoconfigure: Check for GCC diagnostic pragma support inside of functions
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.

6 years agoavformat/matroskaenc: make 2 tables static that are not used outside matroskaenc
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>
6 years agomovenc: make uuids static const
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>
6 years agoavcodec: Add output_picture_number to AVCodecParserContext
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>
6 years agoDisable deprecation warnings for cases where a replacement is available
Diego Biurrun [Wed, 27 Mar 2013 17:36:51 +0000 (18:36 +0100)]
Disable deprecation warnings for cases where a replacement is available

6 years agobuild: Add _Pragma macro to disable deprecated declaration warnings
Diego Biurrun [Wed, 27 Mar 2013 17:23:01 +0000 (18:23 +0100)]
build: Add _Pragma macro to disable deprecated declaration warnings

6 years agodoc/print_options: Move options headers to a saner place
Diego Biurrun [Thu, 1 Aug 2013 12:41:34 +0000 (14:41 +0200)]
doc/print_options: Move options headers to a saner place

6 years agoGive less generic names to global library option arrays
Diego Biurrun [Thu, 1 Aug 2013 12:35:01 +0000 (14:35 +0200)]
Give less generic names to global library option arrays

6 years agortmp: Add seek support
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>
6 years agottaenc: fix packet size
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>
6 years agoh264_sei: Return meaningful values
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>
6 years agoavdevice/timefilter-test: dont try to optimize par1 for n0=0 case
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>
6 years agoflvdec: silence unused warning
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>
6 years agoMerge remote-tracking branch 'qatar/master'
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>
6 years agoMerge commit '4c7fd58f8ae729b964b6859eace5ab9a55ce3c8c'
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>
6 years agoMerge commit 'f900f35ac8db4ac30df6fda1c27502c2ef9e6ba5'
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>
6 years agoMerge commit 'e4529df944616917ae8462f5102253ff7f983093'
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>
6 years agoMerge commit '390b4d7088b5cecace245fee0c54a57e24dabdf4'
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>
6 years agoMerge commit 'fd8f91e3f44a2bdbefaaebead388133c5fdd3423'
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>
6 years agojpeg2000dec: simplify jpeg2000_read_bitstream_packets()
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>
6 years agoavcodec/wmaenc: change commented assert to av_assert
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>
6 years agompegts: save last pcr of pcr pids in PES Context
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>
6 years agolibxvid: cosmetics: Realign the code
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>
6 years agoffmpeg: raise level for message printed in case of auto-select pixel format
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>
6 years agolavf/movenc: Write disc number and total number of discs as part of metadata.
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.

6 years agolavf/movenc: Write total number of tracks as part of metadata.
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.

6 years agoMerge remote-tracking branch 'qatar/master'
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>
6 years agoMerge commit 'ee37d5811caa8f4ad125a37fe6ce3f9e66cd72f2'
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>
6 years agoh264_sei: K&R formatting cosmetics
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>
6 years agoh264_sei: Remove pointless old comment
Diego Biurrun [Wed, 31 Jul 2013 16:07:53 +0000 (18:07 +0200)]
h264_sei: Remove pointless old comment

6 years agoMerge commit '1851e1d05d06f6ef3436c667e4354da0f407b226'
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>
6 years agoMerge commit '7748dd41be3d6dd6300f14263586af4ee104ead2'
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>
6 years agoMerge commit 'b85dbe68e222586fd77332716eb8ed5724db4e1b'
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>
6 years agotwinvq: Add proper twinvq prefixes to identifiers
Diego Biurrun [Tue, 30 Jul 2013 17:42:21 +0000 (19:42 +0200)]
twinvq: Add proper twinvq prefixes to identifiers

6 years agoflvdec: Eliminate completely silly goto
Diego Biurrun [Wed, 31 Jul 2013 21:56:26 +0000 (23:56 +0200)]
flvdec: Eliminate completely silly goto

6 years agoflvdec: K&R formatting cosmetics
Diego Biurrun [Wed, 31 Jul 2013 22:10:40 +0000 (00:10 +0200)]
flvdec: K&R formatting cosmetics

6 years agoflvdec: Fix = vs. == typo in sample rate check
Diego Biurrun [Wed, 31 Jul 2013 21:59:05 +0000 (23:59 +0200)]
flvdec: Fix = vs. == typo in sample rate check

6 years agoMerge commit 'c7e921a54ffe7feb9f695c82f0a0764ab8d0f62b'
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>
6 years agoMerge commit 'b7e6da988bfd5def40ccf3476eb8ce2f98a969a5'
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>
6 years agoMerge commit '892b0be1dfbdeaf71235fb6c593286e4f5c7e4ec'
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>
6 years agoMerge commit '7531588fffbca1f0afdcc06635999c00dfc16ca6'
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>
6 years agoMerge commit '54e03ff6af8a070f1055edd26028f3f7b2e2ca8e'
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>
6 years agoMerge commit '2e814d0329aded98c811d0502839618f08642685'
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>
6 years agoMerge commit '45dd1ae1b3c18331f3db2293a9135bc5851e553f'
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>
6 years agoavutil/tree: fix memleaks
Michael Niedermayer [Thu, 1 Aug 2013 09:23:45 +0000 (11:23 +0200)]
avutil/tree: fix memleaks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c2e936de07d054bf476e60445b453bf6b4836820'
Michael Niedermayer [Thu, 1 Aug 2013 09:06:38 +0000 (11:06 +0200)]
Merge commit 'c2e936de07d054bf476e60445b453bf6b4836820'

* commit 'c2e936de07d054bf476e60445b453bf6b4836820':
  tree-test: Refactor and plug memory leaks

Conflicts:
libavutil/tree.c

Most of this commit is not merged due to bugs in it

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortsp: Simplify code for forming the remote peer url
Martin Storsjö [Thu, 1 Aug 2013 06:51:10 +0000 (09:51 +0300)]
rtsp: Simplify code for forming the remote peer url

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMerge commit 'a9b04b2c43f95cc17c2291f83c27a3119471d986'
Michael Niedermayer [Thu, 1 Aug 2013 08:41:01 +0000 (10:41 +0200)]
Merge commit 'a9b04b2c43f95cc17c2291f83c27a3119471d986'

* commit 'a9b04b2c43f95cc17c2291f83c27a3119471d986':
  tree.h: K&R formatting and typo cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavframe: have av_frame_get_side_data take const AVFrame*
Vittorio Giovara [Tue, 30 Jul 2013 15:39:07 +0000 (17:39 +0200)]
avframe: have av_frame_get_side_data take const AVFrame*

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agortpproto: Allow specifying a separate rtcp port in ff_rtp_set_remote_url
Martin Storsjö [Wed, 31 Jul 2013 08:48:28 +0000 (11:48 +0300)]
rtpproto: Allow specifying a separate rtcp port in ff_rtp_set_remote_url

A separate rtcp port can already be set when opening the rtp
protocol normally, but when doing port setup as in RTSP (where
we first need to open the local ports and pass them to the peer,
and only then receive the remote peer port numbers), we didn't
check the same url parameter as in the normal open routine.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortpproto: Check the size before reading buf[1]
Martin Storsjö [Wed, 31 Jul 2013 09:45:33 +0000 (12:45 +0300)]
rtpproto: Check the size before reading buf[1]

I doubt that anyone ever would try to send a 1 byte packet
via the RTP protocol, but check just in case - it shouldn't
crash at least.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agodoc/protocols: Document file protocol options
Andrey Utkin [Sun, 14 Jul 2013 10:43:25 +0000 (13:43 +0300)]
doc/protocols: Document file protocol options

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolclenc: remove unused code
Paul B Mahol [Fri, 26 Jul 2013 21:45:10 +0000 (21:45 +0000)]
lclenc: remove unused code

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agosunrastenc: do not set avctx->coded_frame
Paul B Mahol [Fri, 26 Jul 2013 14:16:42 +0000 (14:16 +0000)]
sunrastenc: do not set avctx->coded_frame

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agojv: make code independent of sizeof(AVFrame)
Paul B Mahol [Wed, 31 Jul 2013 14:57:27 +0000 (14:57 +0000)]
jv: make code independent of sizeof(AVFrame)

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agomss3: make code independent of sizeof(AVFrame)
Paul B Mahol [Mon, 29 Jul 2013 15:27:05 +0000 (15:27 +0000)]
mss3: make code independent of sizeof(AVFrame)

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agomss2: make code independent of sizeof(AVFrame)
Paul B Mahol [Mon, 29 Jul 2013 15:20:15 +0000 (15:20 +0000)]
mss2: make code independent of sizeof(AVFrame)

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoindeo2: make code independent of sizeof(AVFrame)
Paul B Mahol [Fri, 26 Jul 2013 14:58:44 +0000 (14:58 +0000)]
indeo2: make code independent of sizeof(AVFrame)

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agosmacker: make code independent of sizeof(AVFrame)
Paul B Mahol [Fri, 26 Jul 2013 14:41:38 +0000 (14:41 +0000)]
smacker: make code independent of sizeof(AVFrame)

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavconv: add -n option to immediately exit when output files already exist
Vittorio Giovara [Wed, 31 Jul 2013 12:48:49 +0000 (14:48 +0200)]
avconv: add -n option to immediately exit when output files already exist

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoDocument new 'blocksize' option of 'pipe' protocol
Andrey Utkin [Wed, 31 Jul 2013 12:22:02 +0000 (15:22 +0300)]
Document new 'blocksize' option of 'pipe' protocol

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofile: Add 'blocksize' option
Andrey Utkin [Wed, 31 Jul 2013 12:22:01 +0000 (15:22 +0300)]
file: Add 'blocksize' option

Interruptibility of file operations is strongly desirable in case of
slow storage access, e.g. mounted network share.
This commit introduces possibility to limit data quantity transferred by
'file' protocol at once. By default, old behaviour is preserved and data
is still tried to be transferred without block size limitation.

Note that file I/O operation still may block (or even freeze) inside of
single read(2) or write(2) operation.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavconv: Call exit_program instead of exit in avconv_opt as well
Martin Storsjö [Wed, 31 Jul 2013 10:44:17 +0000 (13:44 +0300)]
avconv: Call exit_program instead of exit in avconv_opt as well

This seems to have been missed in 636ced8e1dc.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoavopt: Check whether the object actually has got an AVClass
Martin Storsjö [Mon, 29 Jul 2013 11:53:01 +0000 (14:53 +0300)]
avopt: Check whether the object actually has got an AVClass

AVIOContext has got an av_class member that only gets set if
opening the context using avio_open2, but not if allocating a
custom IO context. A caller that wants to read AVOptions from
an AVIOContext (recursively using AV_OPT_SEARCH_CHILDREN) may
not know if the AVIOContext actually has got a class set or not.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortpproto: Move rtpproto specific function declarations to a separate header
Martin Storsjö [Wed, 31 Jul 2013 09:29:32 +0000 (12:29 +0300)]
rtpproto: Move rtpproto specific function declarations to a separate header

Mixing these with the rtp depacketizer functions in rtpdec.h is
no good.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortpproto: Simplify the rtp_read function by looping over the fds
Martin Storsjö [Wed, 31 Jul 2013 09:21:47 +0000 (12:21 +0300)]
rtpproto: Simplify the rtp_read function by looping over the fds

This avoids having duplicate code where only the fd parameter
differs.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortpproto: Remove a misplaced comment
Martin Storsjö [Wed, 31 Jul 2013 09:17:51 +0000 (12:17 +0300)]
rtpproto: Remove a misplaced comment

The fdset is a pollfd array nowadays, and it is already populated
at this point.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortpproto: Support nonblocking reads
Martin Storsjö [Fri, 26 Jul 2013 17:24:06 +0000 (20:24 +0300)]
rtpproto: Support nonblocking reads

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortpenc: Simplify code by introducing a macro for rescaling NTP timestamps
Martin Storsjö [Wed, 9 Jan 2013 16:55:52 +0000 (18:55 +0200)]
rtpenc: Simplify code by introducing a macro for rescaling NTP timestamps

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoavfilter: Add some missing FF_API_AVFILTERBUFFER ifdefs
Diego Biurrun [Mon, 29 Jul 2013 18:49:53 +0000 (20:49 +0200)]
avfilter: Add some missing FF_API_AVFILTERBUFFER ifdefs

6 years agotree-test: Refactor and plug memory leaks
Diego Biurrun [Tue, 30 Jul 2013 15:28:44 +0000 (17:28 +0200)]
tree-test: Refactor and plug memory leaks

With the most annoying memory leak found by Derek Buitenhuis.

6 years agotree.h: K&R formatting and typo cosmetics
Diego Biurrun [Tue, 30 Jul 2013 17:41:47 +0000 (19:41 +0200)]
tree.h: K&R formatting and typo cosmetics

6 years agolibxvid: Add SSIM displaying through a libxvidcore plugin
Timothy Gu [Wed, 31 Jul 2013 02:40:45 +0000 (19:40 -0700)]
libxvid: Add SSIM displaying through a libxvidcore plugin

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibxvid: add working lumimasking and variance AQ
Timothy Gu [Wed, 31 Jul 2013 02:39:06 +0000 (19:39 -0700)]
libxvid: add working lumimasking and variance AQ

The old implementation is unusable due to change in the Xvid API.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 31 Jul 2013 09:01:30 +0000 (11:01 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  hls: Call avformat_find_stream_info() on the chained demuxers

Conflicts:
libavformat/hls.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoSupport for shine 3.0.0
Romain Beauxis [Sun, 21 Jul 2013 20:40:08 +0000 (15:40 -0500)]
Support for shine 3.0.0