virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Code Issues Releases Activity
42,769 Commits 37 Branches 400 Tags 464 MiB
b2460858f6
Commit Graph

42769 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul B Mahol
b4befca23e swscale: unscaled rgba64->bgr48 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-19 00:16:17 +00:00
Paul B Mahol
9d8eac6899 swscale: simplify unscaled rgb48<->bgr48 
Using av_bswap16 should be enough.
 2012-07-18 23:47:40 +00:00
Michael Niedermayer
204c4e953d Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ppc: fix build with altivec disabled
  vp3: move idct and loop filter pointers to new vp3dsp context
  build: add CONFIG_VP3DSP, reduce repetition in OBJS lists
  tscc2: do not add/subtract 128 bias during DCT
  tscc2: fix typo in DCT
  configure: clarify external library section of help output
  configure: mark libfdk-aac as nonfree
  configure: cosmetics: drop some unnecessary backslashes
  os_support: K&R formatting cosmetics

Conflicts:
	configure
	libavcodec/vp3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-18 22:34:48 +02:00
Michael Niedermayer
c66978e29a sws: more complete doxy for sws_setColorspaceDetails() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-18 21:25:29 +02:00
Stefano Sabatini
5784a46986 lavf/utils: show the number of stream in case of missing parameter 
Increase feedback provided in avformat_find_stream_info().
 2012-07-18 18:08:57 +02:00
Stefano Sabatini
739ec710c4 lavf/utils: suggest what to do in case of missing codec information 
In particular, fix trac issue #218.
 2012-07-18 18:08:57 +02:00
Stefano Sabatini
a293549b32 lavf/utils: extend has_codec_parameters() to make it show what info is missing 
Improve feedback.
 2012-07-18 18:08:56 +02:00
Michael Niedermayer
31a192f387 imgconvert: favor pixel formats without resolution loss 
Fixes Ticket1517

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-18 17:22:17 +02:00
Michael Niedermayer
ef1c0b5295 avfiltergraph: add some debug info about selected pixel formats 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-18 17:22:17 +02:00
Stefano Sabatini
6a314d59d5 configure: simplify dependencies for x11_grab_device 
XShmCreateImage dependency is implied by x11grab.
 2012-07-18 17:13:34 +02:00
Stefano Sabatini
0cc9077a87 configure: fix help message for --disable-avfilter 
Increase consistency with the other similar messages.
 2012-07-18 17:13:29 +02:00
Stefano Sabatini
712d82130e lavfi/avfiltergraph: apply misc fixes to fix avfilter_graph_request_oldest() @return doxy 2012-07-18 17:13:00 +02:00
Michael Niedermayer
dece4f4693 ffmpeg: revert 3ba90d9 (cosmetics to reduce difference to qatar by about 90 lines) 
This commit caused Ticket1490 (Infinity loop / lock in export image)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-18 16:35:38 +02:00
Michael Niedermayer
60f3291086 mlpdec: switch to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-18 16:22:41 +02:00
Michael Niedermayer
ba0e69994d sws/input: switch to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-18 16:22:41 +02:00
Mans Rullgard
ffdd93a25e ppc: fix build with altivec disabled 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-07-18 13:34:42 +01:00
Mans Rullgard
28f9ab7029 vp3: move idct and loop filter pointers to new vp3dsp context 
This moves all VP3-specific function pointers from dsputil to a
new vp3dsp context.  There is no reason to ever use the VP3 IDCT
where an MPEG2 IDCT is expected or vice versa.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-07-18 10:32:19 +01:00
Mans Rullgard
ab9f987661 build: add CONFIG_VP3DSP, reduce repetition in OBJS lists 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-07-18 10:32:18 +01:00
Kostya Shishkov
4cfb0d871d tscc2: do not add/subtract 128 bias during DCT 
It turns out that the reference decoder subtracts 128 from DC during block
decode but adds it back during reordering block with zigzag pattern.
Transforming block with incorrect DC caused heavy visual artifacts for
many quantisers.
 2012-07-18 07:05:59 +02:00
Kostya Shishkov
3c6c19184c tscc2: fix typo in DCT 2012-07-18 07:05:53 +02:00
Diego Biurrun
c547e5ff98 configure: clarify external library section of help output 2012-07-18 02:11:04 +02:00
Diego Biurrun
87246953d8 configure: mark libfdk-aac as nonfree 2012-07-18 02:00:22 +02:00
Diego Biurrun
47876d661a configure: cosmetics: drop some unnecessary backslashes 2012-07-18 02:00:21 +02:00
Michael Niedermayer
56ae5926f7 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  libopenjpeg: introduce encoding support
  libopenjpeg: rename decoder source file.
  RTMPTS protocol support
  RTMPS protocol support
  avconv: print an error message when demuxing fails.
  tscc2: DCT output should not be clipped
  rtmp: Rename rtmphttp to ffrtmphttp

Conflicts:
	Changelog
	configure
	doc/general.texi
	libavcodec/libopenjpegenc.c
	libavcodec/version.h
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-18 01:27:19 +02:00
Nicolas George
d483867525 avfiltergraph: document a catch in request_oldest(). 
This one is tricky. Consider a graph with two sink links, A and B.
request_oldest() requests on A, and A returns EOF. This EOF causes
a filter to flush pending frames to B; they are unrequested.
Then request_oldest() moves on to B, and B returns EOF.
 2012-07-17 23:47:33 +02:00
Nicolas George
f98d814bb6 avfiltergraph: add a debug message on EOF. 2012-07-17 23:46:26 +02:00
Nicolas George
d06bfda07e lavfi: rescale link->current_pts. 
The doxy says, and the heap implementations assumes,
it is in AV_TIME_BASE units.
 2012-07-17 23:46:26 +02:00
Diego Biurrun
7a249625fd os_support: K&R formatting cosmetics 2012-07-17 20:10:50 +02:00
Paul B Mahol
0b74b8f649 ptx: correct decoding 
The image data is in BGR and not in RGB.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-17 17:06:24 +00:00
Michael Niedermayer
ad8dabfe9c mov/aac: skip initial aac padding 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-17 17:09:19 +02:00
Piotr Bandurski
b688c7b7f9 riff: add "SM4V" FourCC 
Reviewed-by: compn <tempn@twmi.rr.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-17 16:56:51 +02:00
William Yu
6d4e0d1b7e avf:rmdec.c fill duration to AVFormatContext 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-17 16:47:20 +02:00
Michael Bradshaw
453c02f971 libopenjpeg: introduce encoding support 
Based on FFmpeg version from
commit 713a7854e0

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2012-07-17 14:56:58 +02:00
Michael Bradshaw
b43a7bb4f9 libopenjpeg: rename decoder source file. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2012-07-17 14:56:22 +02:00
Michael Niedermayer
21d8255423 sws: handle non native rgb<->rgb convertions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-17 14:40:59 +02:00
Michael Niedermayer
22a279539e yuv2rgb: implement 15/16bit ordered dither 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-17 14:25:49 +02:00
Samuel Pitoiset
86991ce2dd RTMPTS protocol support 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-17 14:02:55 +03:00
Samuel Pitoiset
6aedabc9b6 RTMPS protocol support 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-17 13:53:33 +03:00
Nicolas George
1d903a5ee4 lswr: channel_map requires input conversion. 
channel_map is applied between in and postin.
Without this test, if the input format is an acceptable internal format,
the in->postin conversion is skipped. In the best case,
it ignores channel_map, in the worst case it causes an assert failure
if the number of channels is changed by the map.
 2012-07-17 09:50:36 +02:00
Anton Khirnov
5417efbbf3 avconv: print an error message when demuxing fails. 
Also exit in such a case if -xerror is used.

Fixes bug 329.
 2012-07-17 09:50:26 +02:00
chinshou
81dd908c6e Fix libilbc compilation. 
Fixes ticket #1540
 2012-07-17 08:53:36 +02:00
Carl Eugen Hoyos
7f5fae1e48 mpeg4videodec: Add two missing format specifiers for debug output. 2012-07-17 08:12:49 +02:00
Carl Eugen Hoyos
34aa61a36d mpeg4videodec: Use format specifier PRId64 for int64_t. 2012-07-17 08:11:31 +02:00
Carl Eugen Hoyos
6dfea3a361 Remove internal MPlayer FourCC viv1. 
Reviewed-by: Derek Buitenhuis
Reviewed-by: Paul B Mahol
 2012-07-17 08:09:32 +02:00
Kostya Shishkov
0b40153d20 tscc2: DCT output should not be clipped 
This fixes decoding some TSCC2 files with large quantisers.
 2012-07-17 07:21:24 +02:00
Michael Niedermayer
bdf28d14f2 sws: extend dither tables by 1 line so simpler arithmetic can be used to address the next line 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-17 05:40:36 +02:00
Paul B Mahol
3071af6cf2 tiff: read more tags of type string 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-17 01:23:35 +00:00
Paul B Mahol
292850b634 tiff: add smarter checks if there is enough data left 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-17 01:23:34 +00:00
Paul B Mahol
1ec83d9a9e tiff: port to bytestream2 
Prevents out of array reads.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-17 01:12:55 +00:00
Samuel Pitoiset
775c4d3625 rtmp: Rename rtmphttp to ffrtmphttp 
The prefix makes it easier to distinguish the proper end-user
protocols from the internal ones.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-17 01:19:01 +03:00