virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
43,941 Commits 37 Branches 400 Tags 460 MiB
78cca74222
Commit Graph

43941 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xidorn Quan
78cca74222 vdadec: implement vda decoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-28 04:07:53 +02:00
Michael Niedermayer
e367d90664 aiffdec: support QDM2 
Fixes ticket204

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-28 03:18:21 +02:00
Kari Lentz
be862c0dac movenc: support for itunes tempo tag 
Implements support for tmpo atom for mp4 files, typically used to store BPM.  -metadata "tmpo=127" as a command line option will record 127 as the BPM in the meta data.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-27 19:06:32 +02:00
Reimar Döffinger
237f53ce85 cllc: simplify/fix swapped data buffer allocation. 
Using the malloc variant avoids pointless memcpy on size
increase and simplifies handling allocation failure.
Also change code to ensure that allocation, bswap and bitstream
reader all use the same size, even when the packet size is odd
for example.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-08-27 19:00:47 +02:00
Georg Lippitsch
5cc5d9d5f7 dpx: 10 and 12 bit decoding 
Rewrite 10 bit dpx decoder to decode into GBRP10 color space
instead of converting to RGB48.
Add 12 bit decoder to decode into GBRP12 color space.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-27 18:31:21 +02:00
Michael Niedermayer
99f5090714 aiffdec: try #2 to fix bps 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-27 16:50:59 +02:00
Michael Niedermayer
4abb88d7e8 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  vf_hqdn3d: Don't declare the loop variable within the for loop
  huffyuv: update to current coding style
  huffman: update to current coding style
  rtsp: Free the rtpdec context properly
  build: fft: x86: Drop unused YASM-OBJS-FFT- variable

Conflicts:
	libavcodec/huffman.c
	libavcodec/huffyuv.c
	libavcodec/x86/Makefile
	libavfilter/vf_hqdn3d.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-27 16:32:44 +02:00
Martin Storsjö
2bd67175c7 vf_hqdn3d: Don't declare the loop variable within the for loop 
This C99 feature is generally not used in the libav codebase,
since it breaks building with some fringe compilers (GCC 2.95,
MSVC).

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-08-27 15:29:39 +03:00
Luca Barbato
e0f7a9f6e7 huffyuv: update to current coding style 2012-08-27 13:26:58 +02:00
Luca Barbato
f76e47877c huffman: update to current coding style 2012-08-27 13:26:58 +02:00
Martin Storsjö
125c6c0752 rtsp: Free the rtpdec context properly 
The condition for calling the rtpdec cleanup was broken in
df8cf076c8.

This fixes a memory leak.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-08-27 12:29:47 +03:00
Stefano Sabatini
60924dfe55 examples/decoding_encoding: make operation logic more self-evident / predictable 
Add a switch which controls which operation to perform.  Useful to test
only a single feature. Also the new behavior is more self-consistent.
 2012-08-27 10:09:48 +02:00
Stefano Sabatini
3b0e2763f4 examples/Makefile: apply misc minor fixes to the RM rule 
Use $(RM) in place of rm, drop useless "-r" for removing files.
 2012-08-27 10:09:39 +02:00
Stefano Sabatini
c0bca6425d examples/decoding_encoding: store temporary files in current dir 
Do not clutter the temporary directory with files, also "/tmp" is not
always available, e.g. in Windows.

Also add the clean-test Makefile rule, which will clean the generated
files.
 2012-08-27 10:09:31 +02:00
Carl Eugen Hoyos
73b40dafc8 Use correct format identifier for uint64_t. 2012-08-27 09:14:40 +02:00
Michael Niedermayer
4e8b206092 mpc: fix seeking to the end 
Fixes Ticket1689

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-27 05:23:42 +02:00
Michael Niedermayer
a503afb11f mpc: clip seeking timestamp in valid range 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-27 04:51:27 +02:00
Diego Biurrun
3f02c533f3 build: fft: x86: Drop unused YASM-OBJS-FFT- variable 2012-08-27 03:10:58 +02:00
Michael Niedermayer
b9b97c2fb9 aiffdec: fix bits per sample 
Fixes Ticket1660

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-27 02:54:00 +02:00
Marton Balint
a366beaf6a ffplay: fix odd YUV width by cropping the video 
Should fix issue #1322.

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-27 01:44:57 +02:00
jamal
95d1af1188 build: Fix compilation when configuring with a prog suffix 
Fixes ticket #1676

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-27 01:32:13 +02:00
Michael Niedermayer
851bac4b06 vf_hqdn3d: avoid declaring variable in for() 
This should fix compilation with gcc 2.95 and possibly others

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-27 00:36:31 +02:00
Michael Niedermayer
17106a7c90 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  audio_frame_queue: Clean up ff_af_queue_log_state debug function
  dwt: Remove unused code.
  cavs: convert cavsdata.h to a .c file
  cavs: Move inline functions only used in one file out of the header
  cavs: Move data tables used in only one place to that file
  fate: Add a single symbol Ut Video decoder test
  vf_hqdn3d: x86 asm
  vf_hqdn3d: support 16bit colordepth
  avconv: prefer user-forced input framerate when choosing output framerate

Conflicts:
	ffmpeg.c
	libavcodec/audio_frame_queue.c
	libavcodec/dwt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-26 22:40:02 +02:00
Michael Niedermayer
3a621c9d99 nutenc: Support writing an index 
The seek test improves in accuracy
Fixes Ticket877

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-26 22:15:21 +02:00
Michael Niedermayer
b2a8ce4e67 nutenc: keep track of max_pts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-26 22:15:20 +02:00
Michael Niedermayer
c2a134c66c nutenc: keep track if keyframe PTS 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-26 22:15:19 +02:00
Michael Niedermayer
e6a045ba56 nutdec: Flip the direction for seeking with an index in the failure case. 
This is closer to how seeking works without an index

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-26 22:15:18 +02:00
Michael Niedermayer
cebbaf578d nutdec: improve information in error message 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-26 22:15:18 +02:00
Michael Niedermayer
d1ee2cf74a nutenc: keep track of the written syncpoint count 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-26 22:15:16 +02:00
Diego Biurrun
d7f9786cbc audio_frame_queue: Clean up ff_af_queue_log_state debug function 
The function is debug-only, so only compile it in debug mode.
Make it static as it has no uses outside of the file.
Change av_log() to av_dlog().
 2012-08-26 19:45:23 +02:00
Diego Biurrun
1ce5dce454 dwt: Remove unused code. 2012-08-26 14:03:57 +02:00
Mans Rullgard
88386feefd cavs: convert cavsdata.h to a .c file 
Defining tables in header files is ugly and prone to duplication.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-08-26 14:03:56 +02:00
Diego Biurrun
a6d9f9e60e cavs: Move inline functions only used in one file out of the header 2012-08-26 14:03:56 +02:00
Diego Biurrun
ef07ac1e12 cavs: Move data tables used in only one place to that file 2012-08-26 14:03:55 +02:00
Jan Ekström
09bd0ea94e fate: Add a single symbol Ut Video decoder test 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-08-26 14:03:55 +02:00
Loren Merritt
7a1944b907 vf_hqdn3d: x86 asm 
13% faster on penryn, 16% on sandybridge, 15% on bulldozer
Not simd; a compiler should have generated this, but gcc didn't.
 2012-08-26 10:49:14 +00:00
Loren Merritt
566858a770 vf_hqdn3d: support 16bit colordepth 2012-08-26 10:49:14 +00:00
Paul B Mahol
8f9941b160 avrndec: silence warning about incompatible pointer types 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-08-26 10:24:42 +00:00
Anton Khirnov
44b0b85fe9 avconv: prefer user-forced input framerate when choosing output framerate 2012-08-26 07:50:06 +02:00
Michael Niedermayer
bfb39023b0 h264: ff_init_cabac_states doesnt use its argument thus remove it 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-26 05:44:46 +02:00
Michael Niedermayer
c684cb29bc Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  x86: fft: remove unused fft_dispatch* functions
  avconv: remove unused variable opt_shortest
  FATE: Add Canopus Lossless tests
  cllc: Pad swapped buffer

Conflicts:
	ffmpeg_opt.c
	tests/ref/fate/cllc-argb
	tests/ref/fate/cllc-rgb

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-26 02:34:24 +02:00
Michael Niedermayer
0c3a3b75d7 ac3_probe: fix probing of non standard AC3 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-26 01:55:10 +02:00
Mans Rullgard
db70730291 x86: fft: remove unused fft_dispatch* functions 
These functions are not used since the yasm conversion.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-08-25 23:58:26 +01:00
Mans Rullgard
cba79d2123 avconv: remove unused variable opt_shortest 
This was replaced with a per-file value in 3c0df90.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-08-25 23:29:48 +01:00
Michael Niedermayer
4b9e44868b lavf: fix avio statistics for packets directly read without the buffer. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-25 23:25:36 +02:00
Derek Buitenhuis
efab2e004a FATE: Add Canopus Lossless tests 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-08-25 16:46:50 -04:00
Philip Langdale
2626cc4580 matroska: Mark S_TEXT/UTF-8 as Subrip encoded subtitles. 
While not explicitly stated in the specs, the original author
has stated that S_TEXT/UTF-8 is expected to be text using Subrip
markup, but without Subrip in-band timing.

So, now that we have a decoder that conforms to this expectation,
let's use it.

Note that this change will impact tools that use libavformat. If
they expect srt subtitles to have CODEC_ID_TEXT, they must be
adjusted to expect CODEC_ID_SUBRIP. The actual content is, obviously,
unchanged.

Signed-off-by: Philip Langdale <philipl@overt.org>
 2012-08-25 13:15:41 -07:00
Piotr Bandurski
0bb37bbc0f riff: fix remuxing of atrac3 in wav 
The original codec expects 0 as bps or refuses to play the remuxed file.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-25 20:21:52 +02:00
Paul B Mahol
65b552cc31 lavc: add some missing .long_name to codec_descriptors[] 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-08-25 10:53:47 +00:00
Carl Eugen Hoyos
4abb3539a6 Fix one of the problems with -codecs, -encoders and -decoders. 2012-08-25 08:49:23 +02:00