Michael Niedermayer
805fbbefb3
libavcodec/bintext.h: Fix duplicate words
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c77c5f6c9f
libavcodec/bink.c: Fix duplicate words
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
9da6e742f4
libavcodec/avcodec.h: Fix duplicate words
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
f10462377d
libavcodec/ac3tab.c: Fix duplicate words
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
7fabf3a4b7
libavcodec/ac3enc_template.c: Fix duplicate words
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
a8163a786b
doc/filters.texi: Fix duplicate words
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
e1c44be802
doc/filter_design.txt: Fix duplicate words
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Kirill Gavrilov
53f309c617
pixfmt: extend description for planar YUV 9/10 bits formats
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Kirill Gavrilov
2395ae22ce
img2dec: fix typo (double "with with")
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Paul B Mahol
d4ab1292e9
ffmpeg_filter: do not pick evil path for trim filters
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Paul B Mahol
9087dcbe5b
lavfi/trim: check for right default value
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Michael Niedermayer
c103d5f538
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
wmall: use AVFrame API properly
Conflicts:
libavcodec/wmalosslessdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Thilo Borgmann
f18ccb529f
Fix wrong use of "an" in some comments.
11 years ago
Michael Niedermayer
98fd8a7848
avcodec: Remove ff_packet_free_side_data, use av_packet_free_side_data
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
wm4
a5ef7960fc
ape: check avio_read() return value
...
This sets pkt->size to absurd values on failure otherwise.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Hendrik Leppkes
3ca5df36a5
wmall: use AVFrame API properly
...
This fixes a bug with non-refcounted callers resulting in invalid memory access.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11 years ago
Reimar Döffinger
d404fe35b2
Make new VDPAU easier to use by adding context to callback.
...
Using VDPAU correctly means checking for preemption
and possibly regenerating the context all the time.
With the current API there is no context or other
user-defined pointer and thus this in not possible
during decoding unless using some hack like global
variables.
The need to reinitialize both surfaces and even function
pointers makes handling preemption even more difficult.
This patch introduces a new render2 function that gets
both the AVCodecContext and AVFrame in addition,
in both the user can store additional opaque data.
This allows even advanced approaches like keeping a
"generation counter" for the surfaces so they can be
regenerated on the fly and efficiently.
In addition, the function has a return value that will
be passed through all the way instead of being silently
ignored as for the current render function.
Unfortunately the HWAccel API has no way of providing
API/ABI compatibility, so a currently disallowed
state (render pointer being NULL) is used to extend it.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
11 years ago
Reimar Döffinger
af05edc658
vdpau: Add an allocation function for AVVDPAUContext.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
11 years ago
Reimar Döffinger
d87f9da53c
vdpau_internal.h: Add missing include for FF_API_BUFS_VDPAU.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
11 years ago
Reimar Döffinger
49cf36f4e3
sanm: fix undefined behaviour on big-endian.
...
A variable with post-increment may only appear
once in a statement.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
11 years ago
Michael Niedermayer
61e0e80999
tiff: continue parsing on non fatal errors
...
Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
8e119a22c4
mpeg4videodec: Parse newpred headers
...
This is untested due to lack of a non broken file using new pred
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
06137a496b
mpeg4videodec: check resolution marker bits
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
5717689c75
avutil/avstring: make const tables static const
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
2215947438
avutil/parseutils:make const tables static const
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
64a3dbadee
avutil/ripemd:make const tables static const
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
0e98a13322
avutil/xtea: make const tables static const
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
90b40b45d4
avutil/sha:make const tables static const
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
475df42eb6
avutil/sha512: make const tables static const
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Mark Harris
4ccafaca1c
avformat/id3v2enc: use UTF-16 in id3v2.3 APIC frame only if non-ASCII
...
This makes the encoding of picture descriptions consistent with the
encoding of other text id3 tags and works better with iTunes, which
does not display pictures with some UTF-16 picture descriptions
(including a UTF-16 empty string, i.e. BOM + terminator). It also
saves a few bytes.
Example:
ffmpeg -f lavfi -i sine=b=4 -f lavfi -i smptebars -map 0:a -map 1:v \
-codec:a libmp3lame -codec:v mjpeg -id3v2_version 3 \
-metadata:s:v comment="Cover (front)" -t 3 -y out.mp3
This example does not set a picture description (-metadata:s:v title=)
so an empty string is written in the id3v2.3 APIC frame. Without this
patch, UTF-16 is used and the cover art does not display in iTunes.
With the patch the cover art is displayed. (Note that iTunes does not
display or have a way to set picture descriptions, only the picture
itself, but nevertheless has trouble skipping some UTF-16 descriptions.)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
15c92f8c48
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
rtmp: Do not misuse memcmp
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
99091ff217
Merge commit '205a4502d3da9de2db75d2c965c9d065574e9266'
...
* commit '205a4502d3da9de2db75d2c965c9d065574e9266':
doc: Clarify the avconv section about -re
Conflicts:
doc/ffmpeg.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
5993b96269
Merge commit 'd175a5730b42166704b7262b33f4b780d9d92f60'
...
* commit 'd175a5730b42166704b7262b33f4b780d9d92f60':
doc: Add an example on publishing over RTMP
doc: Add librtmp to the section header for the librtmp specific details
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
159dfd2625
Merge commit 'a435ca5b4d9efebf0759220681010977c36615f7'
...
* commit 'a435ca5b4d9efebf0759220681010977c36615f7':
doc: Explain that the default RTMP user agent is different when publishing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
78242e4310
Merge commit 'aa16a6b0c56e3f46c5d7efb706b87a8f7a1603ec'
...
* commit 'aa16a6b0c56e3f46c5d7efb706b87a8f7a1603ec':
doc: Extend the rtmp example to include how to pass username/password
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
6c7a05352f
Merge commit '8e1fe345577a42f99591caf8a06c447613449694'
...
* commit '8e1fe345577a42f99591caf8a06c447613449694':
rtmp: Detect and warn if the user tries to pass librtmp style parameters
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
06186a3160
Merge commit 'ba5393a609c723ec8ab7f9727c10fef734c09278'
...
* commit 'ba5393a609c723ec8ab7f9727c10fef734c09278':
rtmp: rename data_size to size
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
a2b0699f4f
Merge commit '4ebc7d659f0da6c1305ca08cf4303959203fff4b'
...
* commit '4ebc7d659f0da6c1305ca08cf4303959203fff4b':
rtmp: Use PRId64 when needed.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
b905a7137a
avcodec/avpacket: Fix memory allocation failure check
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
67a580f423
Merge commit '5a9a9d4a2abefa63d9a898ce26715453c569e89d'
...
* commit '5a9a9d4a2abefa63d9a898ce26715453c569e89d':
lavc: Add refcounted api to AVPacket
Conflicts:
libavcodec/avpacket.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
921c1d4c95
Merge commit 'c1076d8479a6c0ee2e0c4b0e2151df5b0228438e'
...
* commit 'c1076d8479a6c0ee2e0c4b0e2151df5b0228438e':
h264: check one context_init() allocation
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
d2d8e259fd
Merge commit '5eb488bfa835f2902a31ba99d57c16ae36c4f598'
...
* commit '5eb488bfa835f2902a31ba99d57c16ae36c4f598':
h264: use explicit variable names for *_field_flag
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
019eb2c77b
svq3: Fix ff_h264_check_intra_pred_mode() return code check
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
e0b45ca730
Merge commit 'b3dc260e7fa6f3f852dd5cb7d86763c4b5736714'
...
* commit 'b3dc260e7fa6f3f852dd5cb7d86763c4b5736714':
h264: return meaningful values
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Luca Barbato
5718e3487b
rtmp: Do not misuse memcmp
...
CC: libav-stable@libav.org
11 years ago
Thilo Borgmann
4dcb2f7478
lavu: fix grammar in doxy for av_frame_ref.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Almer
214293b143
lavd: Fix make checkheaders
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Derek Buitenhuis
d9c1fb8376
bprint: Include va_copy compat
...
Fixes build with MSVC and ICL.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
11 years ago
Nicolas George
d5f38847f5
tests/fli: avoid rounding errors in -t option.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
5fc5170c55
avutil/opt: make const tables static const
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago