virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
Code Issues Releases Activity
41,507 Commits 37 Branches 400 Tags
Commit Graph

41507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clément Bœsch
9fb2e234d0 movenc: add timecode track support. 2012-06-11 07:35:14 +02:00
Clément Bœsch
9846a9c701 riff: add ISMP/timecode tag. 2012-06-11 07:28:26 +02:00
Michael Niedermayer
0478d5f9fe ffmpeg: allow overriding framerate for stream copy 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-11 03:00:28 +02:00
James Zern
cb7f062286 libvpxenc: add support for forced key frames 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-11 02:06:43 +02:00
Michael Niedermayer
a5ca3203f0 rangecoder: use av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-10 23:36:22 +02:00
Michael Niedermayer
1248de53c1 amrnbdec: use av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-10 23:35:29 +02:00
Michael Niedermayer
4e3a5bc1f6 j2k: remove unreachable assert() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-10 23:27:17 +02:00
Michael Niedermayer
3630a07513 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  libmp3lame: add missing layout terminator
  avconv: multithreaded demuxing.
  Bump lavu minor and add an APIChanges entry for audioconvert functions.
  audioconvert: add a function for extracting the channel with the given index
  audioconvert: add a function for getting the name of a single channel.
  audioconvert: add a function for getting channel's index in layout
  audioconvert: use av_popcount64 in av_get_channel_layout_nb_channels
  vf_libopencv: add missing headers.
  iac: add missing dependency

Conflicts:
	configure
	doc/APIchanges
	ffmpeg.c
	libavcodec/libmp3lame.c
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-10 21:34:15 +02:00
Michael Niedermayer
9e724d7216 dct-test: fix alignment in ff_prores_idct_put_10_sse2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-10 20:45:55 +02:00
Michael Niedermayer
234d42f53b postprocess: fix another void returning void function. 
lets hope this makes suncc happy finally ...

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-10 18:26:16 +02:00
Stefano Sabatini
ee1748ab53 lavfi: fix signature for default_filter_name() 
Return a const char *, fix warnings:
libavfilter/avfilter.c: In function ‘default_filter_name’:
libavfilter/avfilter.c:414:5: warning: return discards ‘const’ qualifier from pointer target type [enabled by default]
libavfilter/avfilter.c: At top level:
libavfilter/avfilter.c:419:5: warning: initialization from incompatible pointer type [enabled by default]
libavfilter/avfilter.c:419:5: warning: (near initialization for ‘avfilter_class.item_name’) [enabled by default]
 2012-06-10 17:23:58 +02:00
Michael Niedermayer
91bdced363 mpegtsenc: prevent pcr_packet_period==0 
a period of 1 is the smallest that makes sense

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-10 16:50:06 +02:00
Michael Niedermayer
1321e6eaa7 tiffenc: use av_assert() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-10 15:40:24 +02:00
Michael Niedermayer
bcbb30e2a0 libmp3lame: add missing layout terminator 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-06-10 14:06:50 +02:00
Nicolas George
0d24931604 vf_fps: set frame_rate. 2012-06-10 10:53:03 +02:00
Nicolas George
c8428a0d06 vf_tile: update deprecated functions. 2012-06-10 10:40:33 +02:00
Nicolas George
7b993c4a51 vf_tile: set frame_rate. 2012-06-10 10:35:17 +02:00
Nicolas George
4adf5dfadb sdl: fix aspect ratio computations. 
The rounding was wrong due to incorrect ue of floats,
changed to rationals and av_rescale.

The results were not properly passed to SDL.
 2012-06-10 09:57:50 +02:00
Nicolas George
3ff6b1a2b3 sdl: fix overlay size. 
The size passed to SDL_CreateYUVOverlay is the size
of the video in pixels, it must not take the aspect ratio
into account.
 2012-06-10 09:42:31 +02:00
Nicolas George
2f9907be3e sdl: add AVFMT_VARIABLE_FPS and AVFMT_NOTIMESTAMPS. 
It allows vsync to be automatically set to passthrough.
 2012-06-10 09:42:31 +02:00
Anton Khirnov
5db5169e46 avconv: multithreaded demuxing. 
When there are multiple input files, run demuxing for each input file in
a separate thread, so reading packets does not block.

This is useful for achieving low latency when reading from multiple
(possibly slow) input streams.
 2012-06-10 08:12:23 +02:00
Anton Khirnov
b0f0dfc485 Bump lavu minor and add an APIChanges entry for audioconvert functions. 2012-06-10 08:04:01 +02:00
Anton Khirnov
59d58b3390 audioconvert: add a function for extracting the channel with the given index 2012-06-10 08:03:45 +02:00
Anton Khirnov
5df320e167 audioconvert: add a function for getting the name of a single channel. 2012-06-10 08:03:11 +02:00
Anton Khirnov
406b257de9 audioconvert: add a function for getting channel's index in layout 2012-06-10 08:02:18 +02:00
Anton Khirnov
3596de55fc audioconvert: use av_popcount64 in av_get_channel_layout_nb_channels 2012-06-10 08:02:11 +02:00
Anton Khirnov
d7d071a673 vf_libopencv: add missing headers. 
Fix build after b74a1da4.
 2012-06-10 08:02:02 +02:00
Kostya Shishkov
19be0f3ca6 iac: add missing dependency 2012-06-10 06:50:10 +02:00
Michael Niedermayer
4bfee465e9 bprint-test: avoid z modifier, mingw fails with it 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-10 03:49:31 +02:00
Michael Niedermayer
d35c27db63 sink_buffer: dont return void from void functions. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-10 03:30:12 +02:00
Michael Niedermayer
3b196bb737 libavcodec/x86/rv40dsp_init.c: add missing HAVE_YASM 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-10 03:26:24 +02:00
Michael Niedermayer
915ec91e6b libavcodec/x86/h264dsp_mmx.c: add forgotten HAVE_YASM 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-10 03:23:44 +02:00
Michael Niedermayer
63bfee8796 libavcodec/x86/dwt.c: move some missed things under HAVE_YASM 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-10 03:20:27 +02:00
Michael Niedermayer
b84c9cf7f7 dct-test: fix #if for ff_prores_idct_put_10_sse2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-10 03:15:38 +02:00
Michael Niedermayer
7b0d362567 libavfilter: make ff_null_start_frame_keep_ref() a non static inline function. 
Its only used through the start_frame pointer and thus cannot be inlined easily.
It also appears to break compilation with some unidentified compiler on darwin.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-10 03:08:19 +02:00
Michael Niedermayer
8836b41a78 fate-acodec-dca2: add bitexact flag 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-10 02:57:45 +02:00
Michael Niedermayer
fd8da83d55 enc_dec_pcm: add bitexact flag 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-10 02:57:25 +02:00
Michael Niedermayer
8f1b139c10 cmdutils: dont return void from a void function 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-10 02:38:01 +02:00
Michael Niedermayer
dfaf2dd956 h264: use externally provided dimensions when they appear to be more correct. 
This is based on:
	commit 30f515091c323da59c0f1b533703dedca2f4b95d
	Author: Mans Rullgard <mans@mansr.com>
    		h264: allow cropping to AVCodecContext.width/height

The above commit is not taken as is as its buggy (incorrect handling of
the interlaced case) and didnt apply cleanly.

Fixes ticket156

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-10 02:24:25 +02:00
Paul B Mahol
3275981207 libopenjpegdec: make use of FF_ARRAY_ELEMS 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-06-09 23:34:15 +00:00
James Zern
695e85f189 libvpxenc: add VP8E_SET_MAX_INTRA_BITRATE_PCT mapping 
defines 'max-intra-rate' in line with vpxenc param

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-10 01:18:42 +02:00
Stefano Sabatini
53dfc38452 lavu/timestamp: remove duplicate definition of AV_TS_MAX_STRING_SIZE 2012-06-10 00:37:02 +02:00
Paul B Mahol
1ef5561a66 libopenjpeg: YUVA422P and YUVA444P support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-06-09 18:36:56 +00:00
Michael Niedermayer
75f8f70221 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  h264: allow cropping to AVCodecContext.width/height
  mov: set AVCodecContext.width/height for h264
  iac: generate codec tables as they are supposed to be
  indeo4: handle frame type 1 properly
  lavu: change versioning script to include all av* prefixed symbols

Conflicts:
	libavcodec/h264.c
	libavutil/libavutil.v

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-09 20:30:17 +02:00
Paul B Mahol
8554e21f79 ffv1enc: add yuva422p to .pix_fmts 
This was forgotten in 4e4634aa160ad0e27bee5e7809edbfcace08eba6.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-06-09 18:15:50 +00:00
Michael Niedermayer
94632dbb1e Merge remote-tracking branch 'cus/stable' 
* cus/stable:
  ffplay: fix return value of get_video_frame if avcodec_decode_video fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-09 20:09:56 +02:00
J. Bohl
2138bc16fd remove unreferenced table "dnxhd_1238_ac_index_flag" (empty curly braces did not compile with ICL12.1) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-09 20:09:43 +02:00
Paul B Mahol
a474403229 libopenjpegdec: unbreak yuva420p support 
Regression introduced in b7a928b2d1563575a8d9ec5aa606f735620b38ab.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-06-09 18:06:09 +00:00
Marton Balint
143a5390bf ffplay: fix return value of get_video_frame if avcodec_decode_video fails 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2012-06-09 19:45:10 +02:00
Paul B Mahol
7655cc395d colorspace-test: add few more tests 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-06-09 14:38:51 +00:00