generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
58,439 Commits 24 Branches 241 Tags 173 MiB
5e1c57f5cb
Commit Graph

58439 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Olofsson
3b1dcdec7d libavcodec/xsubenc.c: Fix bounding box coordinates 
Fix coordinates of the lower right corner of the text area.
Note that the coordinates are redundant as the size and
position of the text area are known.
Many decoders (including Sony Playstation 3, VLC and FFmpeg)
ignore the redundant coordinates.
Some hardware decoders need them for correct playback.

Verified on Philips DVD player models HTS7201 and DVP3380.

Fixes ticket #3031

Signed-off-by: Erik Olofsson <eaj.olofsson@gmail.com>
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-12 03:15:33 +01:00
Michael Niedermayer
355cea8ddc Merge remote-tracking branch 'cus/stable' 
* cus/stable:
  libzvbi-teletextdec: propagate errors generated in page handler
  libzvbi-teletextdec: dont ignore memory allocation error silently
  libzvbi-teletextdec: output ass subtitles instead of plain text
  ass: move text_event_to_ass from textdec.c to ass.c and export it
  ass: fix error handling in ff_ass_add_subrect
  ass: factor out ff_ass_bprint_dialog
  libzvbi-teletextdec: use AVBPrint for whitespace cleanup
  libzvbi-teletextdec: use option constants instead of strings
  libzvbi-teletextdec: fix indentation after last commit
  libzvbi-teletextdec: support multiple teletext pages in a single packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-11 22:29:48 +01:00
Michael Niedermayer
43bf4297e4 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mpegaudioenc: Move some static tables to MpegAudioContext

Conflicts:
	libavcodec/mpegaudioenc.c
	libavcodec/mpegaudiotab.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-11 22:21:38 +01:00
Michael Niedermayer
afc660ab9b Merge commit '5d6a990c115850326711c2f5be4d9fd33f399616' 
* commit '5d6a990c115850326711c2f5be4d9fd33f399616':
  mpegaudioenc: Remove broken integer-only quantization code path

Conflicts:
	libavcodec/mpegaudioenc.c

Mostly not merged, the integer code works fine.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-11 21:46:35 +01:00
Michael Niedermayer
f9b89b61f8 avformat/electronicarts: check chunksize more completely in probe() 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-11 21:31:56 +01:00
Michael Niedermayer
20769d9349 avformat/electronicarts: check chunk size. 
Fix infinite loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-11 19:51:12 +01:00
Michael Niedermayer
bdab2421a5 avformat/dfa: check first frame offset in probe 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-11 19:38:38 +01:00
Michael Niedermayer
f66f3819b9 avformat/bethsoftvid: check 4th header byte in probe 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-11 17:50:51 +01:00
Michael Niedermayer
650fd9c004 avformat/avr: check channels and bps in probe 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-11 14:51:43 +01:00
Michael Niedermayer
676bc505f7 avformat/utils: disabled debug code to collect format probing statistics 
This allows collecting statistics on probing scores and the amount of data
probing needed for various files and formats.
For example it can be used to find out which formats tend to need more
data for probing or which files are probed with less certain/lower scores

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-11 13:06:36 +01:00
Timothy Gu
a7f35afb56 doc: delete viterbi.txt 
The description has been moved to the FFmpeg wiki:
https://trac.ffmpeg.org/wiki/ViterbiAlgorithm

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-11-11 10:45:19 +01:00
Michael Niedermayer
8cdf4e0823 ffmpeg: remove unneeded include "libswscale/swscale.h" 
Found-by: ramiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 21:45:19 +01:00
Marton Balint
c0479f0f06 libzvbi-teletextdec: propagate errors generated in page handler 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-11-10 20:00:01 +01:00
Marton Balint
4947b0624b libzvbi-teletextdec: dont ignore memory allocation error silently 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-11-10 20:00:01 +01:00
Marton Balint
3c4b5275b6 libzvbi-teletextdec: output ass subtitles instead of plain text 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-11-10 19:59:59 +01:00
Clément Bœsch
199b8fbd09 avfilter/fade: use FADE_OUT macro. 2013-11-10 19:16:45 +01:00
Clément Bœsch
981128c2c1 avfilter/fade: remove a bunch of useless parenthesis. 2013-11-10 19:15:48 +01:00
Clément Bœsch
461e810cfc avfilter/fade: use inlink->frame_count. 2013-11-10 19:12:36 +01:00
Clément Bœsch
3e1097b909 avfilter/fade: add color option. 
Fixes Ticket #1822.
 2013-11-10 19:05:08 +01:00
Marton Balint
b96325e023 ass: move text_event_to_ass from textdec.c to ass.c and export it 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-11-10 18:57:52 +01:00
Marton Balint
0f0a8d9859 ass: fix error handling in ff_ass_add_subrect 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-11-10 18:57:51 +01:00
Marton Balint
f148954b0a ass: factor out ff_ass_bprint_dialog 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-11-10 18:57:51 +01:00
Marton Balint
65fb59abd2 libzvbi-teletextdec: use AVBPrint for whitespace cleanup 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-11-10 18:57:51 +01:00
Marton Balint
b689b1f6ee libzvbi-teletextdec: use option constants instead of strings 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-11-10 18:57:51 +01:00
Marton Balint
688652e0d6 libzvbi-teletextdec: fix indentation after last commit 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-11-10 18:57:51 +01:00
Marton Balint
a494757b34 libzvbi-teletextdec: support multiple teletext pages in a single packet 
After this patch, if a packet contains multiple teletext pages, the teletext
decoder can return the fist page and store the remaining pages in memory, and
return them to the user on the next calls to avcodec_decode_subtitle2.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-11-10 18:57:51 +01:00
Michael Niedermayer
78e150c5e9 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  hwaccel: Simplify ff_find_hwaccel

Conflicts:
	libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 17:37:51 +01:00
Diego Biurrun
45ef963908 mpegaudioenc: Move some static tables to MpegAudioContext 
This reduces global state and the amount of globally visible tables.
 2013-11-10 16:07:22 +01:00
Diego Biurrun
5d6a990c11 mpegaudioenc: Remove broken integer-only quantization code path 2013-11-10 16:07:22 +01:00
Michael Niedermayer
2fbc759d08 avformat/diracdec: check 2 chunks in probe 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 16:06:16 +01:00
Luca Barbato
08303d7741 hwaccel: Simplify ff_find_hwaccel 
It is always called by passing fields from an AVCodecContext.
 2013-11-10 13:59:48 +01:00
Michael Niedermayer
023953e964 avformat/astdec: increase the score for odd samplerate/channels to max/8 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 13:37:06 +01:00
Michael Niedermayer
eb96802355 avformat/rsd: increase the score for odd samplerate/channels to max/8 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 13:37:03 +01:00
Michael Niedermayer
ef28694d36 avformat/lvfdec: increase the score for odd channels to max/8 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 13:36:59 +01:00
Michael Niedermayer
9225ebd50d avformat/swfdec: return AVPROBE_SCORE_MAX / 4 for unexpected versions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 13:25:35 +01:00
Michael Niedermayer
b570835296 avformat/ape: check version in probe 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 13:25:35 +01:00
Timothy Gu
bc27309591 doc/encoders: fix libfdk-aac "Examples" subsection 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-11-10 12:36:54 +01:00
Michael Niedermayer
1836a42c29 avcodec/vp8: remove unused webp_decode_frame() 
See: libavcodec/webp.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 12:27:21 +01:00
Michael Niedermayer
59ce62f713 avformat/dv: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 12:27:17 +01:00
Timothy Gu
3853fcd5a9 doc/doxy-wrapper: disable inserting headers and footers 
The headers and footers are used to integrate Doxygen into Libav's website.
Fixes the Libav-ish look when doing `make apidoc`.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 02:33:33 +01:00
Michael Niedermayer
52268def10 avformat/thp: check fps value during probing 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 02:04:08 +01:00
Michael Niedermayer
858ef56297 avformat/thp: do not set sample_rate for a video codec 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 02:04:08 +01:00
Ronald S. Bultje
dd3d0f46bd vp9: fix mvref finding to adhere to bug in libvpx. 
Fixes a particular youtube video that I unfortunately can't share.
 2013-11-09 21:31:06 +01:00
Erik Olofsson
f5bffd3a1a libavf/avienc: store language metadata for XSUB streams 
Formatted in such a way that DivX certified players can decode it.
Verified on Sony Playstation 3 and Philips DVP3380.

Fixes ticket 2385

Signed-off-by: Erik Olofsson <eaj.olofsson@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-09 20:33:04 +01:00
Stefano Sabatini
f591ba60ff ffmpeg: generate more specific error message in case of inconsistent filtering options 
In particular, distinguish if the option was -filter or -filter_script.

Suggested-by: Nicolas George
 2013-11-09 19:05:35 +01:00
Stefano Sabatini
0f8bdfe3e8 ffmpeg: store value of -filter and -filter_script per-stream option in OutputStream struct 
Avoid the need for multiple potentially inconsistent access operations,
slightly factorize code.
 2013-11-09 19:05:34 +01:00
Michael Niedermayer
ef8f293472 avformat/dv: consider a header match at byte 0 to count as detection of dv in probe 
This reduces the amount of data needed to identify dv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-09 18:39:09 +01:00
Michael Niedermayer
e624df5dc3 mpegts: only calculate stat index when its needed during probe 
40% faster probe

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-09 16:09:26 +01:00
Michael Niedermayer
9825b99eca avformat/mpegts: do not hardcode type used in memset() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-09 16:03:41 +01:00
Michael Niedermayer
76a47d66c4 avformat/dv: about 3 times faster probe 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-09 14:46:14 +01:00