virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
48,136 Commits 37 Branches 400 Tags 467 MiB
76f126ba2e
Commit Graph

48136 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Piotr Bandurski
76f126ba2e rmdec: set bit rate for ra3 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-23 15:59:41 +01:00
Michael Niedermayer
8e09e183fc Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  8bps: cosmetics
  aasc: cosmetics, reformat
  ansi: remove an extra return
  asvdec: cosmetics, reformat
  aura: cosmetics, reformat

Conflicts:
	libavcodec/aasc.c
	libavcodec/asvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-23 15:03:15 +01:00
Michael Niedermayer
def18e5470 Merge commit 'b047c68783aa4042b322af7af043b643d5daf09c' 
* commit 'b047c68783aa4042b322af7af043b643d5daf09c':
  4xm: don't rely on get_buffer() initializing the frame.
  huffyuv: split encoder and decoder into separate files.
  lavc: make pkt_{p,d}ts doxy less confusing

Conflicts:
	libavcodec/Makefile
	libavcodec/huffyuv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-23 14:53:21 +01:00
Michael Niedermayer
2f9903f662 Merge commit '418693bdc5edad72b0d055f741931612d797eb05' 
* commit '418693bdc5edad72b0d055f741931612d797eb05':
  lavc: rewrite and extend AVFrame doxy
  opt: avoid segfault in av_opt_next() if the class does not have an option list
  ttadec: fix last frame handling when seeking
  alacdec: do not be too strict about the extradata size

Conflicts:
	libavcodec/alac.c
	libavcodec/avcodec.h
	libavcodec/tta.c
	libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-23 13:32:40 +01:00
Anton Khirnov
b6d7d4efae 8bps: cosmetics 
Remove some pointless comments and empty lines.
 2012-12-23 11:17:53 +01:00
Anton Khirnov
b047c68783 4xm: don't rely on get_buffer() initializing the frame. 2012-12-23 11:17:53 +01:00
Anton Khirnov
c64cf2a37b aasc: cosmetics, reformat 2012-12-23 11:17:53 +01:00
Anton Khirnov
808b2227d7 ansi: remove an extra return 2012-12-23 11:17:53 +01:00
Anton Khirnov
c3a76c3dec asvdec: cosmetics, reformat 2012-12-23 11:17:53 +01:00
Anton Khirnov
bdfa24514e aura: cosmetics, reformat 2012-12-23 11:17:53 +01:00
Anton Khirnov
2ca5ca2957 huffyuv: split encoder and decoder into separate files. 2012-12-23 11:17:49 +01:00
Anton Khirnov
6e5c44b043 lavc: make pkt_{p,d}ts doxy less confusing 2012-12-23 10:35:32 +01:00
Anton Khirnov
418693bdc5 lavc: rewrite and extend AVFrame doxy 2012-12-23 10:35:27 +01:00
Michael Niedermayer
f9d8658d67 libpostproc: fix leak of 2kb 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-23 04:55:14 +01:00
Michael Niedermayer
ca9eb9305a mpegvideo_enc: fix edge emulation of dimension%16 != 0 for YUV != 420 
Fixes Ticket2041

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-23 04:20:18 +01:00
James Darnley
707af43d19 lavf/y4m: spellcheck 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-23 01:01:17 +01:00
Piotr Bandurski
2e6bd22bbf rmdec: set bit rate for ra4 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-23 00:10:49 +01:00
Michael Niedermayer
bc5d6e4b96 docs: point to aresample from asyncts docs 
"Fixes" Ticket2036

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-22 22:33:57 +01:00
Stefano Sabatini
60c801c679 lavf/hlsenc: reuse pattern string, rather than redefining it 
Improve robustness.
 2012-12-22 22:02:06 +01:00
Stefano Sabatini
005b360b9c lavf/hlsenc: fix basename size computation off-by-one bug 2012-12-22 22:02:06 +01:00
Justin Ruggles
d02202e08a opt: avoid segfault in av_opt_next() if the class does not have an option list 
CC: libav-stable@libav.org
 2012-12-22 15:43:27 -05:00
Justin Ruggles
5778299c7e ttadec: fix last frame handling when seeking 
Using a frame count, as is done currently, does not work at all with
seeking. Instead, when the number of samples in the final frame has
been decoded, we check if only the 32-bit CRC is remaining. If so, we
assume that it is the final frame.

There is no longer a need to keep total_frames in TTAContext.
 2012-12-22 14:45:35 -05:00
Johannes Nixdorf
e749b5dd98 configure: consider using /usr/include/openjpeg-1.5 when searching for openjpeg 
Beginning with version 1.5.1 openjpeg defaults to install its headers to
/usr/include/openjpeg-${major}.${minor} instead of /usr/include without
providing a compatibility symlink making the old test fail.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-22 18:55:39 +01:00
Michael Niedermayer
985aa0be82 h264: Detect POC inconsistencies and try to handle them reasonably 
Improves the file from Ticket2050

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-22 18:35:43 +01:00
Justin Ruggles
68a04b0cce alacdec: do not be too strict about the extradata size 
Sometimes the extradata has duplicate atoms, but that shouldn't prevent
decoding. Just ensure that it is at least 36 bytes as a sanity check.

CC: libav-stable@libav.org
 2012-12-22 12:18:41 -05:00
Stefano Sabatini
5715d67bae Changelog: add entry about the new documentation layout design 2012-12-22 17:58:56 +01:00
Clément Bœsch
1330d1d049 doc/filters: reword introduction sentence of aformat. 2012-12-22 16:25:15 +01:00
Clément Bœsch
ba5ea7db99 doc/filters: simplify escaping in aformat. 
Escaping the '=' is not necessary, and quoting the arguments allow to
remove the comma escaping as well.
 2012-12-22 16:25:15 +01:00
Stefano Sabatini
0824aa6743 doc/filters: add overlay daisy-chaining example 2012-12-22 16:15:53 +01:00
Stefano Sabatini
35b97ad7c0 doc/filters: rework and itemize examples for the overlay filter 2012-12-22 16:15:13 +01:00
Stefano Sabatini
bde1e8bf06 lavfi/overlay: make use of av_opt_set_from_string() 
Simplify.
 2012-12-22 16:14:23 +01:00
Stefano Sabatini
5e402a5319 lavfi/overlay: switch to filter_frame API 2012-12-22 16:12:26 +01:00
Michael Niedermayer
98256622a6 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  flac: only set channel layout if not previously set or on channel count change
  prepare 9_beta3 release

Conflicts:
	RELEASE

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-22 13:25:53 +01:00
Justin Ruggles
aef5150719 flac: only set channel layout if not previously set or on channel count change 
Fixes Bug 402
 2012-12-22 01:35:28 -05:00
Michael Niedermayer
3f72dbe462 ffplay: fix another use of context instead of frame parameters 
Fixes Ticket2050

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-22 03:41:55 +01:00
Michael Niedermayer
5ffb5e7a2d 4xm: check the correct stream, fix fate 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-22 03:41:55 +01:00
Paul B Mahol
44fe118e0a lavc/4xm: use bytestream2_get_bytes_left 
Also replace relevant bytestream2 functions with unchecked variants due
code that already checks for overreads.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-22 00:27:29 +00:00
Stefano Sabatini
6b50df6b3a doc/filters: rename reference to movie filter from "src_movie" to "movie" 
Should be less confusing.
 2012-12-22 01:03:46 +01:00
Michael Niedermayer
e16bac7b33 videodsp: Fix project name 
These are all part of splited out dsp utils from FFmpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-22 00:58:08 +01:00
Michael Niedermayer
90eaa989f1 x86/videodsp_init: Add back lost author attribution 
Code originates from:
910b9f30 libavcodec/dsputil.c            (David Conrad        2010-05-27 04:39:27 +0000  334) void ff_emulated_edge_mc(uint8_t *buf, const uint8_t *src, int linesize, int block_w, int block_h,
93a21abd libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-14 18:37:35 +0000  335)                                     int src_x, int src_y, int w, int h){
93a21abd libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-14 18:37:35 +0000  336)     int x, y;
93a21abd libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-14 18:37:35 +0000  337)     int start_y, start_x, end_y, end_x;
b5a093b3 libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-25 20:22:36 +0000  338)
93a21abd libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-14 18:37:35 +0000  339)     if(src_y>= h){
93a21abd libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-14 18:37:35 +0000  340)         src+= (h-1-src_y)*linesize;
93a21abd libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-14 18:37:35 +0000  341)         src_y=h-1;
225f9c44 libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-15 00:25:53 +0000  342)     }else if(src_y<=-block_h){
225f9c44 libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-15 00:25:53 +0000  343)         src+= (1-block_h-src_y)*linesize;
225f9c44 libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-15 00:25:53 +0000  344)         src_y=1-block_h;
93a21abd libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-14 18:37:35 +0000  345)     }
93a21abd libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-14 18:37:35 +0000  346)     if(src_x>= w){
93a21abd libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-14 18:37:35 +0000  347)         src+= (w-1-src_x);
93a21abd libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-14 18:37:35 +0000  348)         src_x=w-1;
225f9c44 libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-15 00:25:53 +0000  349)     }else if(src_x<=-block_w){
225f9c44 libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-15 00:25:53 +0000  350)         src+= (1-block_w-src_x);
225f9c44 libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-15 00:25:53 +0000  351)         src_x=1-block_w;
93a21abd libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-14 18:37:35 +0000  352)     }
93a21abd libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-14 18:37:35 +0000  353)
b8a78f41 libavcodec/mpegvideo.c          (Michael Niedermayer 2002-11-10 11:46:59 +0000  354)     start_y= FFMAX(0, -src_y);
b8a78f41 libavcodec/mpegvideo.c          (Michael Niedermayer 2002-11-10 11:46:59 +0000  355)     start_x= FFMAX(0, -src_x);
b8a78f41 libavcodec/mpegvideo.c          (Michael Niedermayer 2002-11-10 11:46:59 +0000  356)     end_y= FFMIN(block_h, h-src_y);
b8a78f41 libavcodec/mpegvideo.c          (Michael Niedermayer 2002-11-10 11:46:59 +0000  357)     end_x= FFMIN(block_w, w-src_x);

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-22 00:58:08 +01:00
Michael Niedermayer
28286a63d0 videodsp_template.c: fix year 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-22 00:58:08 +01:00
Stefano Sabatini
e64a7f2c78 doc/default.css: use ffmpeg.org website CSS 
The attribute container of the top-level div is changed from "class" to
"id" to match the website CSS.

Improve consistency between website docs and local documentation style.
 2012-12-22 00:38:48 +01:00
Stefano Sabatini
042c2a1af8 doc: move HTML CSS to a dedicated file default.css 2012-12-22 00:38:41 +01:00
Paul B Mahol
185d1f3bfc lavfi: declare arrays that never change as static const 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-21 22:38:59 +00:00
Michael Niedermayer
165be91c2b img2enc: fix typo 
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-21 22:56:13 +01:00
Michael Niedermayer
2f436b1fce lavc: Warn in case the set bitrate is very low 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-21 22:50:57 +01:00
rogerdpack
d828bae9d2 better failure message for img2enc 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-21 21:18:12 +01:00
Piotr Bandurski
0e3a4da106 yop: set video bit rate 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-21 21:18:12 +01:00
Paul B Mahol
a8ebb77493 lavfi/swapuv: use FFSWAP 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-21 19:04:11 +00:00
Carl Eugen Hoyos
a3a22c2178 Revert "Always write all colours for animated gif files, including transparent ones." 
It breaks some opaque samples.

This reverts commit d4fdaafdb7.
 2012-12-21 18:18:39 +01:00