Michael Niedermayer
2b0cdb7364
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Move id3v2 tag writing to a separate file.
swscale: add missing colons to x86 assembly yuv2planeX.
g722: split decoder and encoder into separate files
cosmetics: remove extra spaces before end-of-statement semi-colons
vorbisdec: check output buffer size before writing output
wavpack: calculate bpp using av_get_bytes_per_sample()
ac3enc: Set max value for mode options correctly
lavc: move get_b_cbp() from h263.h to mpeg4videoenc.c
mpeg12: move closed_gop from MpegEncContext to Mpeg1Context
mpeg12: move full_pel from MpegEncContext to Mpeg1Context
mpeg12: move Mpeg1Context from mpeg12.c to mpeg12.h
mpegvideo: remove some unused variables from MpegEncContext.
Conflicts:
libavcodec/mpeg12.c
libavformat/mp3enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-24 01:01:21 +02:00
Anton Khirnov
da22ba7df4
mpeg12: move full_pel from MpegEncContext to Mpeg1Context
...
It's MPEG-1 specific.
2011-10-23 14:14:39 +02:00
Mans Rullgard
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Stephen Warren
3bccd93ac0
Set VDPAU H264 picture parameter field_order_cnt and frame_num at the
...
start of decoding a picture instead of at the end.
Fixes mmco01.264
Patch by Stephen Warren
Originally committed as revision 22728 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 08:10:29 +00:00
NVIDIA Corporation
70e0c871eb
Add VDPAU hardware accelerated decoding for MPEG-4 ASP which can be used
...
by video players.
Original patch by NVIDIA corporation.
Originally committed as revision 20502 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-10 18:52:39 +00:00
NVIDIA Corporation
c5b42f4a80
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
...
be used by video players.
Original patch by NVIDIA corporation.
Originally committed as revision 16699 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-20 09:28:36 +00:00
Diego Biurrun
406792e7b0
cosmetics: Remove pointless period after copyright statement non-sentences.
...
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 15:46:40 +00:00
NVIDIA Corporation
d37edddc09
Add VDPAU hardware accelerated decoding for MPEG1 and MPEG2 which can
...
be used by video players.
Original patch by NVIDIA corporation.
Originally committed as revision 16628 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-16 02:14:07 +00:00
Diego Biurrun
84f8d1f604
Add missing #include to fix 'make checkheaders'.
...
Originally committed as revision 16545 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 20:12:14 +00:00
Carl Eugen Hoyos
1717031362
Remove H264Context from vdpau_internal.h.
...
Originally committed as revision 16524 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 00:48:20 +00:00
Carl Eugen Hoyos
c639fc7213
Cosmetics: Rename ff_vdpau_h264_add_data_chunk as ff_vdpau_add_data_chunk.
...
Originally committed as revision 16521 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-10 23:00:48 +00:00
Carl Eugen Hoyos
1968e438d0
Use only MpegEncContext in ff_vdpau_h264_add_data_chunk.
...
Originally committed as revision 16520 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-10 22:57:51 +00:00
Carl Eugen Hoyos
7fd3c09e0f
Move vdpau_h264_set_reference_frames() call from vdpauvideo.c into h264.c.
...
Originally committed as revision 16513 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-10 02:45:07 +00:00
Carl Eugen Hoyos
090846f3b9
Rename ff_VDPAU as ff_vdpau.
...
Originally committed as revision 16492 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-07 23:48:32 +00:00
Diego Biurrun
0d9efa287a
Add missing headers to allow 'make checkheaders' to pass.
...
Originally committed as revision 16481 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-07 18:42:24 +00:00
NVIDIA Corporation
369122dd77
Add VDPAU hardware accelerated decoding for H264 which can be used by
...
video players.
Original patch by NVIDIA corporation.
Originally committed as revision 16431 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-04 23:55:27 +00:00
