ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-21 13:56:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,521 Commits 36 Branches 398 Tags 535 MiB
ab46300078
Commit Graph

42521 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
ab46300078 Merge remote-tracking branch 'dwbuiten/master' 
* dwbuiten/master:
  doc: Remove stray @item from git-howto
  libfdk-aac: Port to ff_alloc_packet2
  doxy: move av_guess_sample_aspect_ratio to correct place

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-15 03:40:19 +02:00
Michael Niedermayer
39afcf1d7e Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  eval: add gt(), gte(), lt() and lte() fate tests
  eval: fix swapping of lt() and lte()
  imgconvert: deprecate avcodec_find_best_pix_fmt()
  imgconvert: add avcodec_find_best_pix_fmt2()
  imgconvert: avoid undefined left shift in avcodec_find_best_pix_fmt

Conflicts:
	libavcodec/imgconvert.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-15 01:23:16 +02:00
Philip Langdale
2c501ae82b movtextdec: 3GPP TS 26.245 Timed Text Decoder. 
This change introduces a basic decoder for 3GPP Timed Text subtitles,
also known as TX3G, Quicktime subtitles, or "movtext" in the existing
code.

This initial change doesn't attempt to parse styling information,
and just reads the plain text of the subtitles. I intend to add
support for styles eventually, but it's challenging due to a lack
of existing players that support them.

Signed-off-by: Philip Langdale <philipl@overt.org>
 2012-07-14 14:50:02 -07:00
Michael Niedermayer
57d5a224ce mp3enc: add lame tag with start padding info 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-14 17:20:22 +02:00
Nicolas George
7b521c52c4 ffmpeg: add -progress option. 
It allows to send program-friendly (easy to parse)
progress information to a file or an URL.
 2012-07-14 14:51:18 +02:00
Janne Grunau
2d497c141d eval: add gt(), gte(), lt() and lte() fate tests 2012-07-14 13:43:10 +02:00
Nicolas George
3aba391fb5 libx264: list possible presets and tunes. 
The values are listed if setting them fails.
Using "-preset help" or "-preset list" have that effect.
 2012-07-14 13:37:50 +02:00
Max Lazarov
caac3ab6ef eval: fix swapping of lt() and lte() 
CC: libav-stable@libav.org
 2012-07-14 13:33:25 +02:00
Stefano Sabatini
160df9797e lavc/tiffenc: apply misc doxy fixes 2012-07-14 13:02:51 +02:00
Stefano Sabatini
6c3b3cfd90 ffprobe: add frame metadata printing 2012-07-14 13:02:51 +02:00
Thomas Kühnel
75abfab6c6 lavc/tiff: add GeoTIFF support to the TIFF decoder 
Work done for SOCIS 2011.

See thread:
Subject: [libav-devel] [PATCH 2/3] tiff: Add GeoTIFF support to the TIFF decoder
Date: Tue,  4 Oct 2011 00:19:52 +0200

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2012-07-14 13:02:38 +02:00
Stefano Sabatini
fb57180698 lavc/avcodec.h: keep avframe_* field setter and getter close 
Slightly more readable, now that the list is getting longer.
 2012-07-14 13:02:25 +02:00
Thomas Kühnel
f49ec1b404 lavc: add metadata to AVFrame 
See thread:
Subject: [libav-devel] [PATCH 1/3] avcodec: add metadata to AVFrame
Date: Tue,  4 Oct 2011 00:19:51 +0200
 2012-07-14 13:00:18 +02:00
jamal
2090e40410 configure: Check that texi2html supports --init-file 
Fixes ticket #1515
 2012-07-14 11:47:15 +02:00
jamal
d48f014ff1 doc/Makefile: Add missing $(HOSTEXESUF) to print_options 2012-07-14 11:47:09 +02:00
jamal
3e03f8d8b2 build: Fix documentation dependencies and rules 2012-07-14 11:47:01 +02:00
Stefano Sabatini
bd58f00ec1 doc/filters: prefer "special" over "magic" for special input/output labels 2012-07-14 11:40:08 +02:00
Stefano Sabatini
b65ccce866 doc/filters: update documentation 
In particular, assume existence of audio and sink filters.
 2012-07-14 11:39:31 +02:00
Stefano Sabatini
5a6c7a218c doc: merge libavfilter.texi into filters.texi 
There is no much point into splitting documentation for filters. Also
having a separate document for a library is inconsistent.
 2012-07-14 11:38:53 +02:00
Michael Niedermayer
825e1e2437 ffmpeg: use pkt_pts before pkt->pts for audio 
This fixes the timestamp of the first packet when samples have been skiped.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-14 04:24:40 +02:00
Michael Niedermayer
744bd8d08c ffmpeg: set pkt_timebase 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-14 04:24:00 +02:00
Michael Niedermayer
aa32971d2b lavc: adjust timestamp in case of skiping initial samples 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-14 03:49:41 +02:00
Michael Niedermayer
2fe186409b lavc: skip initial silence when requested 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-14 03:49:11 +02:00
jamal
0f03563d7e lavc/w32pthreads: Fix make checkheaders. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-14 03:02:03 +02:00
Stefan Gehrer
e98330df90 movenc: write track header transformation matrix depending on "rotate" metadata 
should fix ticket #505
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-14 02:57:11 +02:00
Paul B Mahol
bc0ef29cf0 exr: fix scan_line_size calculation 
This one will also work in cases when file have channels
we are not going to use.

Only compressed files where affected by this bug.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-13 23:48:50 +00:00
Paul B Mahol
cd3136e84a exr: print channel names not yet supported 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-13 23:02:11 +00:00
Paul B Mahol
fedefe4a87 exr: remove double ;; 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-13 21:14:01 +00:00
Paul B Mahol
1033807313 exr: frame multithreading support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-13 21:08:37 +00:00
Michael Niedermayer
674216991d Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  build: Fix APE tag dependencies
  MS Expression Encoder Screen decoder
  libfdk-aac: Allow setting the encoder bandwidth/cutoff frequency

Conflicts:
	Changelog
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-13 22:22:24 +02:00
Michael Niedermayer
af285072b5 ffv1enc: use default number of slices if unspecified 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-13 22:08:27 +02:00
Michael Niedermayer
051dd2eea6 ffv1dec: print timestamp at which a CRC mismatch happened 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-13 22:08:27 +02:00
Compn
c3a4c1bd5a add PLV1 fourcc to mpeg4 
works on http://samples.ffmpeg.org/V-codecs/PLV1/york-water-meteor.avi
 2012-07-13 15:10:53 -04:00
Michael Niedermayer
0eb0b310c4 lavc: add pkt_timebase to allow avcodec to adjust pkt_dts/pts when needed 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-13 20:35:08 +02:00
Janne Grunau
f30260d32a imgconvert: deprecate avcodec_find_best_pix_fmt() 2012-07-13 19:22:46 +02:00
Janne Grunau
ac29054fda imgconvert: add avcodec_find_best_pix_fmt2() 
The number of pixel formats outgrew the number of available bits in
the bitmask used in avcodec_find_best_pix_fmt().
avcodec_find_best_pix_fmt2() uses a PIX_FMT_NONE terminated list
of pixel formats instead.
 2012-07-13 19:22:46 +02:00
burek
cb59e62abb doc/ffmpeg: document more deeply -re option. 
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Lou Logan <lou@lrcd.com>
 2012-07-13 18:38:49 +02:00
Derek Buitenhuis
86dd5fbf15 doc: Remove stray @item from git-howto 
Fixes warning:
    ** @item outside of table or list (l. 362)

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-07-13 11:51:06 -04:00
Derek Buitenhuis
7ff318e2dd libfdk-aac: Port to ff_alloc_packet2 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-07-13 11:51:06 -04:00
Derek Buitenhuis
29470bb940 doxy: move av_guess_sample_aspect_ratio to correct place 
It should not be a part of the RIFF FourCCs group.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-07-13 11:51:06 -04:00
Janne Grunau
39bb27bf79 imgconvert: avoid undefined left shift in avcodec_find_best_pix_fmt 
CC: libav-stable@libav.org
 2012-07-13 17:29:27 +02:00
Michael Niedermayer
ff2fda57df doc/protocol.texi: fix missed application reference 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-13 17:17:21 +02:00
Michael Niedermayer
790e25ef61 general.texi: fix project reference 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-13 17:16:13 +02:00
Michael Niedermayer
c5cc94982d matroskaenc: switch to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-13 17:03:57 +02:00
Michael Niedermayer
1cef5a0196 ffmpeg: fix type of av_log() argument 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-13 16:24:32 +02:00
Diego Biurrun
47aed43990 build: Fix APE tag dependencies 2012-07-13 10:17:20 +02:00
Kostya Shishkov
5b7e3a195d MS Expression Encoder Screen decoder 2012-07-13 06:59:48 +02:00
Paul B Mahol
d3abbb1d13 lavc: fix ff_alloc_packet() 
Regression introduced in 740b9ff44.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-13 01:09:43 +00:00
Michael Niedermayer
81fe2e8b36 build_system: mark libfdk as non GPL compatible until the situation is clarified by someone qualified. 
The license fee text may be interpreted as a additional restriction in the GPL sense.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-13 00:51:01 +02:00
Michael Niedermayer
620c6292b1 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  build: Fix Ogg demuxer dependencies
  build: Fix FLAC demuxer dependencies
  flac: Move flac functions shared between libraries to flac common code
  build: Fix CAF demuxer dependencies
  build: Fix MP2 muxer dependencies
  build: Add missing build rules for the ISMV muxer
  configure: Drop redundant mxf_d10 test dependency declaration
  Support AAC encoding via the external library fdk-aac
  libavcodec: Add more AAC profiles
  dct/fft-test: use a replacement getopt() if the system has none present.

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-12 23:57:00 +02:00