generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
30,740 Commits 24 Branches 241 Tags 173 MiB
058d03631a
Commit Graph

30740 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
058d03631a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  cmdutils: add missing NULL check in parse_options()
  x11grab: remove a memory allocation and the associated memcpy.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-13 04:39:58 +02:00
Michael Niedermayer
21d5de9303 H264: Reduce pointless diffs to qatar 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-13 03:51:59 +02:00
Michael Niedermayer
f0e9ee8d94 Revert "H264: Split out hl_motion and template it, this seems a bit faster" 
This reverts commit a50f0bea25.

This has been implemented differently in qatar and its better they
maintain it for me instead of me having to spend an average 5sec more
per merge

Conflicts:

	libavcodec/h264.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-13 03:49:36 +02:00
Stefano Sabatini
3fe6bbd5dc libavfilter: implement avfilter_fill_frame_from_video_buffer_ref() 2011-06-12 22:46:02 +02:00
Stefano Sabatini
c535494268 avfiltergraph: make the AVFilterInOut alloc/free API public 
This is required for letting applications to create and destroy
AVFilterInOut structs in a convenient way.
 2011-06-12 22:46:02 +02:00
Stefano Sabatini
6119b23a36 avfiltergraph: change the syntax of avfilter_graph_parse() 
Make it returns the list of open inputs and outputs, so it can be
reused by applications.

Breaks API/ABI.
 2011-06-12 22:46:02 +02:00
Stefano Sabatini
86909dd5f7 graphparser: prefer void * over AVClass * for log contexts 2011-06-12 22:46:02 +02:00
Alexander Strange
33eac92a3c h264: Complexify frame num gap shortening code 
By observation it did not seem to handle prev_frame_num > frame_num.
This does not affect any files I have.
(cherry picked from commit 43c0092a80f8212cbb783260bafa157f7b85126e)
 2011-06-12 18:02:24 +02:00
Alexander Strange
53781bf13e Update todo 
All the known bugs in h264 are fixed so I'm calling it done.
(cherry picked from commit 9cec36a6845c17e90a8d0c2cf9b03a00987c31f0)
 2011-06-12 18:01:29 +02:00
Michael Niedermayer
225083ac0a mpeg12: replace 2 asserts by av_assert0 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-12 17:59:23 +02:00
Stefano Sabatini
de85935883 cmdutils: add missing NULL check in parse_options() 
Fix ffplay -i FILE, which was recently broken.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-12 14:19:45 +02:00
Sven C. Dack
2f2c60400a x11grab: remove a memory allocation and the associated memcpy. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-12 12:18:05 +02:00
Michael Niedermayer
d127d26997 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  build: fix "make install" with documentation disabled
  build: simplify some conditional targets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-12 04:30:19 +02:00
Michael Niedermayer
2291e18e48 Fix --disable-everything 
Breakage was due to ff_find_pix_fmt() usage.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-12 03:04:07 +02:00
Mans Rullgard
151c584188 build: fix "make install" with documentation disabled 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-11 20:35:53 +01:00
Mans Rullgard
623ffe8c82 build: simplify some conditional targets 
Use intermediate targets instead of variables for conditional
parts of "all" and "install" targets.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-11 19:35:47 +01:00
Clément Bœsch
e8876902a9 resample: clarify supported resampling. 
This also fix a crash on 8ch → 2ch requested resampling.
 2011-06-11 15:09:39 +02:00
Stefano Sabatini
d468ed0321 lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config() 
Require "void *" rather than "AVClass *" for the log context type.
 2011-06-11 12:23:03 +02:00
Stefano Sabatini
f5901fd392 avfiltergraph: use meaningful error codes 2011-06-11 11:55:54 +02:00
Michael Niedermayer
7aa5947181 Revert "ac3: there was no libav in 2010 thus this code cannot be from libav." 
This reverts commit 7b8ec38d28.

The copyright date was wrong.
 2011-06-11 04:18:00 +02:00
Michael Niedermayer
45fb647495 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  bitstream: Properly promote av_reverse values before shifting.
  libavutil/swscale: YUV444P10/YUV444P9 support.
  H.264: Fix high bit depth explicit biweight
  h264: Fix 10-bit H.264 x86 chroma v loopfilter asm.
  Replace DEBUG_SEEK/DEBUG_SI + av_log combinations by av_dlog.
  Update copyright year for ac3enc_opts_template.c.
  adts: Adjust frame size mask to follow the specification.
  movenc: Add RTP muxer/hinter options
  movenc: Pass the RTP AVFormatContext to the SDP generation
  rtspenc: Add RTP muxer options
  rtspenc: Add an AVClass for setting muxer specific options
  rtpenc_chain: Pass the rtpflags options through to the chained muxer
  rtpenc: Declare the rtp flags private AVOptions in rtpenc.h
  sdp: Reindent after the previous commit
  rtpenc: MP4A-LATM payload support
  avoptions: Add an av_opt_flag_is_set function for inspecting flag fields
  sdp: Allow passing an AVFormatContext to the SDP generation
  mov: Fix wrong timestamp generation for fragmented movies that have time offset caused by the first edit list entry.
  mpeg12: more advanced ffmpeg mpeg2 aspect guessing code.
  swscale: split YUYV output out of yuv2packed[12X]_c().

Conflicts:
	doc/APIchanges
	libavcodec/Makefile
	libavcodec/h264dsp_template.c
	libavcodec/mpeg12.c
	libavformat/aacdec.c
	libavformat/avidec.c
	libavformat/internal.h
	libavformat/movenc.c
	libavformat/rtpenc.c
	libavformat/rtpenc_latm.c
	libavformat/sdp.c
	libavformat/version.h
	libavutil/avutil.h
	libavutil/pixfmt.h
	libswscale/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-11 03:51:36 +02:00
Etienne Buira
39dbe9b6b8 Fix -t option for formats which holds dts and no pts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-11 02:26:26 +02:00
Joseph Artsimovich
36204ed88e dnxhd: Renama tables 2011-06-10 22:13:26 +02:00
Dave Badia
d3cef0a85b Extract rotation in MOV metadata 2011-06-10 22:13:26 +02:00
Alex Converse
19d824e473 bitstream: Properly promote av_reverse values before shifting. 2011-06-10 13:04:25 -07:00
Michael Niedermayer
0fd82fedc9 pixfmt: Replace 9/10bit deprecation by a technical explanation. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-10 21:46:51 +02:00
Ronald S. Bultje
103278f7b0 libavutil/swscale: YUV444P10/YUV444P9 support. 
Also add missing glue code for recently added YUV422P10 formats
to swscale.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-06-10 15:12:24 -04:00
Jason Garrett-Glaser
c149843b5a H.264: Fix high bit depth explicit biweight 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-06-10 14:45:49 -04:00
Oskar Arvidsson
6c031a3338 h264: Fix 10-bit H.264 x86 chroma v loopfilter asm. 
The tc variable was not splatted correctly.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-06-10 14:44:57 -04:00
Diego Biurrun
919d7a345a Replace DEBUG_SEEK/DEBUG_SI + av_log combinations by av_dlog. 2011-06-10 19:12:14 +02:00
Justin Ruggles
aecc596a65 Update copyright year for ac3enc_opts_template.c. 
The code was originally committed to Libav on March 25, 2011.
 2011-06-10 12:58:08 -04:00
Kieran Kunhya
f74e5b76b1 adts: Adjust frame size mask to follow the specification. 
This fixes ADTS detection for at least one sample.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-06-10 18:41:04 +02:00
Stefano Sabatini
16c9e6717e APIchanges: fill hash for the avfilter_get_audio_buffer_ref_from_arrays addition 2011-06-10 13:04:50 +02:00
Mina Nagy Zaki
79a0ec1af4 lavfi: avfilter_merge_formats: handle case where inputs are same 
This fixes a double-free crash if lists are the same due to the two
merge_ref() calls at the end of the (useless) merging that happens.
 2011-06-10 13:04:47 +02:00
Stefano Sabatini
989184fea4 lavfi: use avfilter_get_audio_buffer_ref_from_arrays() in defaults.c 
Use avfilter_get_audio_buffer_ref_from_arrays() in
avfilter_default_get_audio_buffer(), simplify.
 2011-06-10 13:02:13 +02:00
Stefano Sabatini
c3819600e2 lavfi: implement avfilter_get_audio_buffer_ref_from_arrays() 2011-06-10 12:47:33 +02:00
Stefano Sabatini
c6d7fc276a APIchanges: remove duplicated entry 2011-06-10 12:32:25 +02:00
Stefano Sabatini
2caaa791a0 APIchanges: fill in dates and numbers 
Since some minor bump were not done, some entries present the same
libavutil minor (which represent the next bump after the corresponding
change).
 2011-06-10 12:32:05 +02:00
Stefano Sabatini
a5825b22a2 APIchanges: remove duplicated entry 
Remove duplicated entry regarding PIX_FMT_BGR48LE/BE formats.
 2011-06-10 12:13:08 +02:00
Stefano Sabatini
e0ce9711aa APIchanges: correctly interleave entries 2011-06-10 12:13:08 +02:00
Stefano Sabatini
bd77a5e27c APIchanges: add entry for av_force_cpu_flags() addition 2011-06-10 12:13:08 +02:00
Stefano Sabatini
ace0a5e236 lavf: bump minor after the addition of fps_probe_size to AVFormatContext 2011-06-10 12:13:08 +02:00
Stefano Sabatini
62519c6139 lavc: bump minor after the addition of AVCodecContext.request_sample_fmt 2011-06-10 12:13:08 +02:00
Martin Storsjö
d16cccac98 movenc: Add RTP muxer/hinter options 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-06-10 10:52:32 +03:00
Martin Storsjö
f3f82296a4 movenc: Pass the RTP AVFormatContext to the SDP generation 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-06-10 10:52:25 +03:00
Martin Storsjö
e2e29c6247 rtspenc: Add RTP muxer options 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-06-10 10:52:22 +03:00
Martin Storsjö
6cf09bb7ef rtspenc: Add an AVClass for setting muxer specific options 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-06-10 10:50:41 +03:00
Martin Storsjö
ff0824f72c rtpenc_chain: Pass the rtpflags options through to the chained muxer 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-06-10 10:50:23 +03:00
Martin Storsjö
635fac9af1 rtpenc: Declare the rtp flags private AVOptions in rtpenc.h 
This allows other muxers that chain a RTP muxer to declare
the same options easily.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-06-10 10:50:08 +03:00
Martin Storsjö
9c434ce826 sdp: Reindent after the previous commit 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-06-10 10:49:55 +03:00