virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Code Issues Releases Activity
35,865 Commits 37 Branches 400 Tags 462 MiB
ee181f84a3
Commit Graph

35865 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diego Biurrun
144904e901 build: rename subdir.mak ---> library.mak 2011-12-13 23:34:22 +01:00
Diego Biurrun
0d9bd2d584 configure: do not manually enable protocols 
Protocols are handled just like all other components groups such as
muxers and are automatically enabled.
 2011-12-13 23:34:20 +01:00
Michael Niedermayer
3ba0bfe71f Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ulti: Fix invalid reads
  lavf: dealloc private options in av_write_trailer
  yadif: support 10bit YUV
  vc1: mark with ER_MB_ERROR bits overconsumption
  lavc: introduce ER_MB_END and ER_MB_ERROR
  error_resilience: use the ER_ namespace
  build: move inclusion of subdir.mak to main subdir loop
  rv34: NEON optimised 4x4 dequant
  rv34: move 4x4 dequant to RV34DSPContext
  aacdec: Use intfloat.h rather than local punning union.

Conflicts:
	libavcodec/h264.c
	libavcodec/vc1dec.c
	libavfilter/vf_yadif.c
	libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-13 23:21:37 +01:00
Reimar Döffinger
36be045ed7 Support "VLB " audio in NSV files. 
See samples/nsv/vlb_audio.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-12-13 23:07:40 +01:00
Michael Niedermayer
16b771b1f4 cleanup: for(int 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-13 21:08:43 +01:00
Michael Niedermayer
b39e01a6e8 clenaup: #ifdec CONFIG* 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-13 21:08:43 +01:00
Clément Bœsch
0b4e5451ba lavfi: use the new audio API in amovie source filter. 2011-12-13 20:25:12 +01:00
Clément Bœsch
220481e1d6 lavfi: skip the frame in case of error. 
This fixes playback with some audio files through filters.
 2011-12-13 20:19:49 +01:00
Michael Niedermayer
f39258d587 lavc: set pkt_?ts to NOPTS in get_frame_defaults. 
Idea-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-13 20:04:43 +01:00
Michael Niedermayer
9aeaf62903 Fix all GNU %Ld 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-13 20:01:49 +01:00
Michael Niedermayer
35f707abe1 twinnvq: remove ;; 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-13 19:54:31 +01:00
Michael Niedermayer
0e187fd13c decoding example: reset pts/dts after subpacket. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-13 19:47:57 +01:00
Michael Niedermayer
6c39b3c278 ffmpeg: reset dts/pts after decoding the first subpacket 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-13 19:46:29 +01:00
Gaurav Narula
a99273ebf3 ulti: Fix invalid reads 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-12-13 20:08:15 +02:00
Luca Barbato
4badb386ce lavf: dealloc private options in av_write_trailer 
Fix the iformat/oformat typo.
 2011-12-13 17:03:08 +01:00
Luca Barbato
d32eed5c73 yadif: support 10bit YUV 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-12-13 17:02:55 +01:00
Luca Barbato
4f3667ba59 vc1: mark with ER_MB_ERROR bits overconsumption 
This patch is a generalization of what Michael Niedermayer
fixed in a single case.

The wmv8-drm fate test had been updated accordingly.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-12-13 16:20:58 +01:00
Luca Barbato
63ccd46687 lavc: introduce ER_MB_END and ER_MB_ERROR 
Simplify a little error resilience calls

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-12-13 16:20:58 +01:00
Luca Barbato
5bf2ac2b37 error_resilience: use the ER_ namespace 
Add the namespace to {AC_,DC_,MV_}{END,ERROR} macros

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-12-13 16:20:58 +01:00
Michael Niedermayer
53be37e368 msrledec: Check for overreads 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-13 15:46:23 +01:00
Michael Niedermayer
be5db7004f aascdec: Check input buffer size on raw data. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-13 15:45:04 +01:00
Mans Rullgard
878dda5db1 build: move inclusion of subdir.mak to main subdir loop 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-12-13 14:26:49 +00:00
Mans Rullgard
4722a03c75 rv34: NEON optimised 4x4 dequant 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-12-13 12:06:21 +00:00
Mans Rullgard
40901fc14e rv34: move 4x4 dequant to RV34DSPContext 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-12-13 12:05:34 +00:00
Alex Converse
5cd56e193f aacdec: Use intfloat.h rather than local punning union. 2011-12-12 21:36:54 -08:00
Michael Niedermayer
a6c4c0f274 mp4enc: Avoid storing sizes in trun when they all match. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-13 03:27:19 +01:00
Michael Niedermayer
d9a41695ed mp4enc: Only store flags in trun when they differ from the default and set a sane default. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-13 03:11:53 +01:00
Michael Niedermayer
1f83f04609 mp4enc: dont store durations in trun if they are unneeded. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-13 03:02:20 +01:00
Michael Niedermayer
4a6855343f mp4enc: dont store cts in trun if they are unneeded. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-13 02:55:37 +01:00
Michael Niedermayer
41c2bbaac6 lavc: use hexadecimal debug print for showing err_recognization values. 
They are flags which makes them easier to read as hex than decimal.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-13 01:28:22 +01:00
Michael Niedermayer
b95565074f msmpeg4dec: restore error concealment functionality after merge 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-13 01:26:28 +01:00
Michael Niedermayer
c9cab022a3 mpeg4dec: restore error concealment functionality after merge 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-13 01:26:14 +01:00
Michael Niedermayer
376ee20614 h263dec: restore error concealment functionality after merge 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-13 01:26:00 +01:00
Michael Niedermayer
8bc7fe4daf Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doxygen: misc consistency, spelling and wording fixes
  vcr1: drop unnecessary emms_c() calls without MMX code
  Replace all uses of av_close_input_file() with avformat_close_input().
  lavf: add avformat_close_input().
  lavf: deprecate av_close_input_stream().
  lavf doxy: add some basic demuxing documentation.
  lavf doxy: add some general lavf information.
  lavf doxy: add misc utility functions to a group.
  lavf doxy: add av_guess_codec/format to the encoding group.
  lavf doxy: add core functions to a doxy group.
  Add basic libavdevice documentation.
  lavc: convert error_recognition to err_recognition.
  avconv: update -map option help text
  x86: Require 7 registers for the cabac asm
  x86: bswap: remove test for bswap instruction
  bswap: make generic implementation more compiler-friendly
  h264: remove useless cast
  proresdec: fix decode_slice() prototype

Conflicts:
	configure
	doc/APIchanges
	ffprobe.c
	libavcodec/avcodec.h
	libavcodec/celp_math.h
	libavcodec/h264.c
	libavfilter/src_movie.c
	libavformat/anm.c
	libavformat/avformat.h
	libavformat/version.h
	libavutil/avstring.h
	libavutil/bswap.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-13 00:39:48 +01:00
Michael Niedermayer
c83ef636a6 build: Disable avconv more completely while leaving the user the option to enable it 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-13 00:05:14 +01:00
Diego Biurrun
58c42af722 doxygen: misc consistency, spelling and wording fixes 2011-12-12 23:06:23 +01:00
Reimar Döffinger
31a68ad554 Update seek reference for added metadata to lavf tests. 
As far as I could see the only change is increased pos values,
which is as expected with additional metadata in the files.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-12-12 21:54:52 +01:00
Paul B Mahol
8b494b7b27 vcr1: drop unnecessary emms_c() calls without MMX code 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-12-12 21:17:13 +01:00
Reimar Döffinger
6c723f3f9d lavf-regression: minimal metadata test. 
This tests writing the global "title" metadata.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-12-12 20:51:29 +01:00
Anton Khirnov
cd3716b9aa Replace all uses of av_close_input_file() with avformat_close_input(). 2011-12-12 20:34:38 +01:00
Anton Khirnov
526604545f lavf: add avformat_close_input(). 
It sets the supplied AVFormatContext pointer to NULL after freeing it,
which is safer and its name is consistent with other lavf functions.

Also deprecate av_close_input_file().
 2011-12-12 20:23:56 +01:00
Anton Khirnov
3a7f7678eb lavf: deprecate av_close_input_stream(). 
And remove all its uses.
 2011-12-12 20:21:47 +01:00
Anton Khirnov
59826cab8a lavf doxy: add some basic demuxing documentation. 2011-12-12 19:44:23 +01:00
Anton Khirnov
ccbc106841 lavf doxy: add some general lavf information. 2011-12-12 19:44:12 +01:00
Anton Khirnov
abf2c2d787 lavf doxy: add misc utility functions to a group. 2011-12-12 19:44:03 +01:00
Anton Khirnov
c8dffc02fd lavf doxy: add av_guess_codec/format to the encoding group. 2011-12-12 19:43:56 +01:00
Anton Khirnov
469c62d002 lavf doxy: add core functions to a doxy group. 2011-12-12 19:43:44 +01:00
Anton Khirnov
1be323054e Add basic libavdevice documentation. 2011-12-12 19:43:37 +01:00
Dustin Brody
5b22d6e132 lavc: convert error_recognition to err_recognition. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-12-12 19:42:50 +01:00
Tomas Härdin
7d531e83b6 mxfdec: Set DTS and PTS on video packets 
This involves computing DTS/PTS from the index tables.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-12 18:34:37 +01:00