virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
55,618 Commits 37 Branches 400 Tags 467 MiB
6e4b9b8a2f
Commit Graph

55618 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
06137a496b mpeg4videodec: check resolution marker bits 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 17:34:29 +02:00
Michael Niedermayer
5717689c75 avutil/avstring: make const tables static const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 16:50:58 +02:00
Michael Niedermayer
2215947438 avutil/parseutils:make const tables static const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 16:50:24 +02:00
Michael Niedermayer
64a3dbadee avutil/ripemd:make const tables static const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 16:49:57 +02:00
Michael Niedermayer
0e98a13322 avutil/xtea: make const tables static const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 16:49:36 +02:00
Michael Niedermayer
90b40b45d4 avutil/sha:make const tables static const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 16:49:21 +02:00
Michael Niedermayer
475df42eb6 avutil/sha512: make const tables static const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 16:49:03 +02:00
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>
 2013-08-11 13:06:40 +02:00
Michael Niedermayer
15c92f8c48 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rtmp: Do not misuse memcmp

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 11:54:37 +02:00
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>
 2013-08-11 11:49:47 +02:00
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>
 2013-08-11 11:37:57 +02:00
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>
 2013-08-11 11:28:54 +02:00
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>
 2013-08-11 11:24:14 +02:00
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>
 2013-08-11 11:17:43 +02:00
Michael Niedermayer
06186a3160 Merge commit 'ba5393a609c723ec8ab7f9727c10fef734c09278' 
* commit 'ba5393a609c723ec8ab7f9727c10fef734c09278':
  rtmp: rename data_size to size

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 11:11:40 +02:00
Michael Niedermayer
a2b0699f4f Merge commit '4ebc7d659f0da6c1305ca08cf4303959203fff4b' 
* commit '4ebc7d659f0da6c1305ca08cf4303959203fff4b':
  rtmp: Use PRId64 when needed.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 11:02:37 +02:00
Michael Niedermayer
b905a7137a avcodec/avpacket: Fix memory allocation failure check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 10:56:07 +02:00
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>
 2013-08-11 10:45:13 +02:00
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>
 2013-08-11 10:35:44 +02:00
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>
 2013-08-11 10:28:49 +02:00
Michael Niedermayer
019eb2c77b svq3: Fix ff_h264_check_intra_pred_mode() return code check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 10:22:51 +02:00
Michael Niedermayer
e0b45ca730 Merge commit 'b3dc260e7fa6f3f852dd5cb7d86763c4b5736714' 
* commit 'b3dc260e7fa6f3f852dd5cb7d86763c4b5736714':
  h264: return meaningful values

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 10:08:48 +02:00
Luca Barbato
5718e3487b rtmp: Do not misuse memcmp 
CC: libav-stable@libav.org
 2013-08-11 01:19:27 +02:00
Thilo Borgmann
4dcb2f7478 lavu: fix grammar in doxy for av_frame_ref. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 00:40:48 +02:00
James Almer
214293b143 lavd: Fix make checkheaders 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 00:40:30 +02:00
Derek Buitenhuis
d9c1fb8376 bprint: Include va_copy compat 
Fixes build with MSVC and ICL.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-08-10 15:53:32 -04:00
Nicolas George
d5f38847f5 tests/fli: avoid rounding errors in -t option. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-10 20:17:10 +02:00
Michael Niedermayer
5fc5170c55 avutil/opt: make const tables static const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-10 18:44:40 +02:00
Michael Niedermayer
18b1381c5f avutil/opt: fix av_log type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-10 18:44:40 +02:00
Michael Niedermayer
db4918b72e avformat/tedcaptionsdec: make const arrays static const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-10 18:44:40 +02:00
Michael Niedermayer
0b5627189d avfilter/f_sendcmd: make const arrays static const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-10 18:44:39 +02:00
Michael Niedermayer
148310ca16 avutil/log: Use bprint for part 
This should fix the issue with strings longer than 1024

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-10 18:17:30 +02:00
Martin Storsjö
205a4502d3 doc: Clarify the avconv section about -re 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-10 18:37:21 +03:00
Martin Storsjö
d175a5730b doc: Add an example on publishing over RTMP 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-10 18:37:21 +03:00
Martin Storsjö
a435ca5b4d doc: Explain that the default RTMP user agent is different when publishing 
The fact that a different user agent is used is cruicial for getting
publishing authentication working. (When using librtmp, this other
user agent has to be specified manually, but that's not needed
with the libavformat internal RTMP support.)

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-10 18:37:21 +03:00
Martin Storsjö
aa16a6b0c5 doc: Extend the rtmp example to include how to pass username/password 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-10 18:37:21 +03:00
Martin Storsjö
3bea53dbdf doc: Add librtmp to the section header for the librtmp specific details 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-10 18:37:21 +03:00
Martin Storsjö
8e1fe34557 rtmp: Detect and warn if the user tries to pass librtmp style parameters 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-10 18:37:18 +03:00
Michael Niedermayer
112c970ca6 avutil/bprint: add av_vbprintf() 
Reviewed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-10 17:01:42 +02:00
Luca Barbato
ba5393a609 rtmp: rename data_size to size 2013-08-10 13:49:09 +02:00
Luca Barbato
4ebc7d659f rtmp: Use PRId64 when needed. 2013-08-10 13:48:48 +02:00
Luca Barbato
5a9a9d4a2a lavc: Add refcounted api to AVPacket 
Provide a clean way to manipulate packets.
 2013-08-10 13:41:35 +02:00
Vittorio Giovara
c1076d8479 h264: check one context_init() allocation 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-08-10 13:36:38 +02:00
Vittorio Giovara
5eb488bfa8 h264: use explicit variable names for *_field_flag 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-08-10 13:36:25 +02:00
Vittorio Giovara
b3dc260e7f h264: return meaningful values 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-08-10 13:28:51 +02:00
Michael Niedermayer
b37ff488b8 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  libavutil: Make avpriv_open a library-internal function on msvcrt

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-10 10:51:03 +02:00
Michael Niedermayer
ef13a005c4 Merge commit 'a76d0cdf21c3d9e464623cc0ad1c005abf952afa' 
* commit 'a76d0cdf21c3d9e464623cc0ad1c005abf952afa':
  libavutil: Move avpriv_open to a new file, file_open.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-10 10:37:20 +02:00
Michael Niedermayer
e3a296dfa5 Merge commit 'cb0244daaca83ab666798818f74f5181bf6bc387' 
* commit 'cb0244daaca83ab666798818f74f5181bf6bc387':
  bktr: Changed a missed occurrance of open into avpriv_open

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-10 10:29:44 +02:00
Michael Niedermayer
09f1afc784 Merge commit '33237123c83bf4f8345e6ac889ad2e7dbd303d0e' 
* commit '33237123c83bf4f8345e6ac889ad2e7dbd303d0e':
  libavutil: Enable the MSVC DLL symbol loading workaround in shared builds as well

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-10 10:24:33 +02:00
Michael Niedermayer
296eaa84b9 Merge commit '9d5ec50ead97e088d77317e77b18cef06cb3d053' 
* commit '9d5ec50ead97e088d77317e77b18cef06cb3d053':
  ff_socket: put out-of-line and fallback to fcntl() for close-on-exec

Conflicts:
	libavformat/network.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-10 10:18:18 +02:00