generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
55,208 Commits 24 Branches 241 Tags 173 MiB
5ad4e29337
Commit Graph

55208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
5ad4e29337 MAINTAINERS: add myself as maintainer for the interface code to swresample & swscale in libavfilter 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-03 12:36:56 +02:00
Michael Niedermayer
62f616ed58 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: 038c4f65ee

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-03 10:55:46 +02:00
Michael Niedermayer
82fdfe8e51 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>
 2013-08-03 10:48:11 +02:00
Michael Niedermayer
1607a98545 avcodec/mlp: Fix bugs in libavs warning fixes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-03 10:27:42 +02:00
Michael Niedermayer
20be5e0a0e 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>
 2013-08-03 10:08:30 +02:00
Diego Biurrun
038c4f65ee 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.
 2013-08-03 10:08:04 +02:00
Michael Niedermayer
85fc1a18ca Merge commit '3a7050ffed5ce061b114a11e4de4b77aba8efa0b' 
* commit '3a7050ffed5ce061b114a11e4de4b77aba8efa0b':
  build: Add _Pragma macro to disable deprecated declaration warnings

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-03 09:27:37 +02:00
Michael Niedermayer
fa5410f61a Merge commit '79be2c325c5ee8f7ac9e28399e51986ebe99bb3c' 
* commit '79be2c325c5ee8f7ac9e28399e51986ebe99bb3c':
  doc/print_options: Move options headers to a saner place

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-03 09:22:30 +02:00
Michael Niedermayer
a8e963835a 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>
 2013-08-03 09:16:36 +02:00
Michael Niedermayer
8e970a5861 Merge commit '0d6fa3977b016f1b72b0b24b8834ff9222498548' 
* commit '0d6fa3977b016f1b72b0b24b8834ff9222498548':
  rtmp: Add seek support

Conflicts:
	Changelog
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-03 09:01:48 +02:00
Michael Niedermayer
7cd13f618c Merge commit '0d8b943d204bd16fcf2f4a59c742e65a401dd3d0' 
* commit '0d8b943d204bd16fcf2f4a59c742e65a401dd3d0':
  h264_sei: Return meaningful values

Conflicts:
	libavcodec/h264_sei.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-03 08:54:54 +02:00
Michael Niedermayer
bdccfc3fc3 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>
 2013-08-03 00:45:08 +02:00
Tim.Nicholson
ae4c912bce 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>
 2013-08-02 23:31:40 +02:00
Carl Eugen Hoyos
401f6a7126 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.
 2013-08-02 23:23:58 +02:00
Michael Niedermayer
154c8bf60b avcodec/mdec: make block_index static const 2013-08-02 23:12:26 +02:00
Michael Niedermayer
f19a23bd4f avcodec/mjpeg: make 2 outcommented tables static 2013-08-02 23:11:58 +02:00
Michael Niedermayer
b984c727f5 avcodec/dxtory: make def_lru[8] static 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-02 23:11:31 +02:00
Michael Niedermayer
04c50cb3a0 avcodec/dnxhdenc: make header_prefix static const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-02 23:10:42 +02:00
Diego Biurrun
6da5b57da1 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.
 2013-08-02 22:34:03 +02:00
Michael Niedermayer
0553f2c6e5 avformat/matroskaenc: make 2 tables static that are not used outside matroskaenc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-02 21:14:59 +02:00
Michael Niedermayer
65dd93209d movenc: make uuids static const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-02 21:14:59 +02:00
Yusuke Nakamura
a8b19271c3 avcodec: Add output_picture_number to AVCodecParserContext 
Set output_picture_number in H.264 parser.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-08-02 20:59:45 +02:00
Diego Biurrun
7950e519bb Disable deprecation warnings for cases where a replacement is available 2013-08-02 19:19:02 +02:00
Diego Biurrun
3a7050ffed build: Add _Pragma macro to disable deprecated declaration warnings 2013-08-02 19:19:02 +02:00
Diego Biurrun
79be2c325c doc/print_options: Move options headers to a saner place 2013-08-02 19:19:02 +02:00
Diego Biurrun
b5a138652f Give less generic names to global library option arrays 2013-08-02 19:19:02 +02:00
Gavriloaie Eugen-Andrei
0d6fa3977b rtmp: Add seek support 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-02 20:11:54 +03:00
Paul B Mahol
bc2187cfdb ttaenc: fix packet size 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-02 16:45:58 +00:00
Vittorio Giovara
0d8b943d20 h264_sei: Return meaningful values 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-08-02 18:19:40 +02:00
Michael Niedermayer
2b9590ebab 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>
 2013-08-02 17:06:13 +02:00
Michael Niedermayer
61a28d00e8 flvdec: silence unused warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-02 13:05:16 +02:00
Michael Niedermayer
2ae5ac78d8 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>
 2013-08-02 12:37:37 +02:00
Michael Niedermayer
da4cd61502 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>
 2013-08-02 12:23:52 +02:00
Michael Niedermayer
67291ffd63 Merge commit 'f900f35ac8db4ac30df6fda1c27502c2ef9e6ba5' 
* commit 'f900f35ac8db4ac30df6fda1c27502c2ef9e6ba5':
  flvdec: Eliminate completely silly goto

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-02 12:19:21 +02:00
Michael Niedermayer
ae48547a52 Merge commit 'e4529df944616917ae8462f5102253ff7f983093' 
* commit 'e4529df944616917ae8462f5102253ff7f983093':
  flvdec: K&R formatting cosmetics

Conflicts:
	libavformat/flvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-02 12:08:56 +02:00
Michael Niedermayer
cb73f84087 Merge commit '390b4d7088b5cecace245fee0c54a57e24dabdf4' 
* commit '390b4d7088b5cecace245fee0c54a57e24dabdf4':
  flvdec: Fix = vs. == typo in sample rate check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-02 11:00:50 +02:00
Michael Niedermayer
ca1b029108 Merge commit 'fd8f91e3f44a2bdbefaaebead388133c5fdd3423' 
* commit 'fd8f91e3f44a2bdbefaaebead388133c5fdd3423':
  rtsp: Simplify code for forming the remote peer url

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-02 10:39:46 +02:00
Michael Niedermayer
bff371e34c 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>
 2013-08-02 03:55:07 +02:00
Michael Niedermayer
5936d98244 avcodec/wmaenc: change commented assert to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-02 03:54:59 +02:00
Marton Balint
d75d911223 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>
 2013-08-02 03:27:47 +02:00
Timothy Gu
b3f858b829 libxvid: cosmetics: Realign the code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-02 03:21:09 +02:00
Stefano Sabatini
f118b41759 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>
 2013-08-01 21:14:48 +02:00
Carl Eugen Hoyos
fbc0004b4b lavf/movenc: Write disc number and total number of discs as part of metadata. 
Fixes ticket #2731.
 2013-08-01 16:21:31 +02:00
Carl Eugen Hoyos
bb7f71d9b6 lavf/movenc: Write total number of tracks as part of metadata. 
Fixes ticket #2157.
 2013-08-01 16:20:58 +02:00
Michael Niedermayer
9408d990c4 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>
 2013-08-01 13:59:50 +02:00
Michael Niedermayer
0f5a40c2a4 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>
 2013-08-01 13:51:44 +02:00
Vittorio Giovara
b18412171f h264_sei: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-08-01 13:26:07 +02:00
Diego Biurrun
4c7fd58f8a h264_sei: Remove pointless old comment 2013-08-01 13:26:07 +02:00
Michael Niedermayer
2ee58af53e Merge commit '1851e1d05d06f6ef3436c667e4354da0f407b226' 
* commit '1851e1d05d06f6ef3436c667e4354da0f407b226':
  rtpproto: Check the size before reading buf[1]

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-01 13:24:57 +02:00
Michael Niedermayer
4f07fcd30b 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: 0a4f02117b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-01 13:21:34 +02:00