提交 · b13ba5cb9a1a56883f0a8e7f7b02f7a1330ccb6d · 小白菜888 / Ffmpeg

06 11月, 2011 33 次提交

M
swscale: use isByteRGB() to simplify check for palToRgbWrapper. · b13ba5cb
由 Michael Niedermayer 提交于 11月 06, 2011
```
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>
```
b13ba5cb
M
swscale: Fix packed rgb check for planarRgbToRgbWrapper. · 307b6502
由 Michael Niedermayer 提交于 11月 06, 2011
```
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>
```
307b6502
T
Unscaled Planar RGB -> RGB support in swscale. · 1e79926f
由 Themaister 提交于 11月 06, 2011
```
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>
```
1e79926f
S

af_aconvert: fix doc reference to unexisting chlayout.h file · 079700f5
由 Stefano Sabatini 提交于 11月 06, 2011

079700f5

Fix av_packet_split_side_data. · 54a09f18

由 Reimar Döffinger 提交于 11月 06, 2011

p cannot be calculated before av_dup_packet since that one
might change avpkt->data, causing invalid reads and a
non-working range check.
Signed-off-by: NReimar Döffinger <Reimar.Doeffinger@gmx.de>

54a09f18

M
fate: fix mapchan · 64bf5a0c
由 Michael Niedermayer 提交于 11月 06, 2011
```
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>
```
64bf5a0c
P
wtvenc: ensure fat tables are padded to the sector boundary · b372723f
由 Peter Ross 提交于 11月 06, 2011
```
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>
```
b372723f
S
lavf: remove commented check in compute_pkt_fields2() · 41ab24ba
由 Stefano Sabatini 提交于 11月 06, 2011
```
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>
```
41ab24ba

Merge remote-tracking branch 'qatar/master' · d8cab5c2

由 Michael Niedermayer 提交于 11月 06, 2011

* qatar/master:
  http: Remove the custom function for disabling chunked posts
  rtsp: Disable chunked http post through AVOptions
  movdec: Set frame_size for AMR
  h264_weight: remove duplication functions.
  swscale: align vertical filtersize by 2 on x86.
  libavfilter: reindent.
  matroskadec: empty blocks are in fact valid.
  avfilter: don't abort() on zero-size allocations.
  h264: improve calculation of codec delay.
  movenc: Set a correct packet size for AMR-NB mode 15, "no data"
  avformat: Add functions for doing global network initialization
  avformat: Add the https protocol
  avformat: Add the tls protocol, using OpenSSL or gnutls
  avformat: Initialize gnutls in ff_tls_init()
  w32threads: Wrap the mutex functions in inline functions returning int
  configure: Allow linking to the gnutls library
  avformat: Add ff_tls_init()/deinit() that initialize OpenSSL
  configure: Allow linking to openssl
  avcodec: Allow locking and unlocking an avformat specific mutex
  avformat: Split out functions from network.h to a new file, network.c

Conflicts:
	Changelog
	configure
	doc/APIchanges
	libavcodec/internal.h
	libavcodec/version.h
	libavfilter/formats.c
	libavformat/matroskadec.c
	libavformat/mov.c
	libavformat/version.h
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

d8cab5c2

P
wtvdec: ignore another known guid · 3b4798a8
由 Peter Ross 提交于 11月 06, 2011
```
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>
```
3b4798a8

Set avctx->coded_width/height to uncropped h264 sizes · 29a29226

由 Joakim Plate 提交于 11月 06, 2011

avctx->width/height remain right/bottom cropped as previous behaviour.

Hardware decoders need to know the uncropped data to allocate surfaces
of correct height. Some hardware is picky and fails to decoder properly
if a surface larger than needed is used during decode, so just aligning
up is not enough.
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

29a29226

audioconvert: use + in av_get_channel_layout_string. · 1125571b

由 Nicolas George 提交于 11月 05, 2011

When constructing a channel layout string from individual channel names,
+ is a more practical separator than |, because it is usually not a shell
special character.
Signed-off-by: NNicolas George <nicolas.george@normalesup.org>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

1125571b

R
dshow: don't print min/max values for fps the wrong way around · 526a7d85
由 Ramiro Polla 提交于 9月 30, 2011
```
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>
```
526a7d85
R
dshow: save opened device reference so it may be properly closed · e3e96283
由 Ramiro Polla 提交于 9月 30, 2011
```
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>
```
e3e96283
R
dshow: release filter reference obtained from enumeration · 21a928d0
由 Ramiro Polla 提交于 9月 30, 2011
```
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>
```
21a928d0
R
dshow: indent · 5b186148
由 Ramiro Polla 提交于 9月 30, 2011
```
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>
```
5b186148
R
dshow: support choosing between devices with same name · 2f9b9559
由 Ramiro Polla 提交于 9月 30, 2011
```
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>
```
2f9b9559
N
src_movie: set the channel layout to default if the codec did not set it. · 68b531fe
由 Nicolas George 提交于 11月 05, 2011
```
Signed-off-by: NNicolas George <nicolas.george@normalesup.org>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>
```
68b531fe
M
matroskaenc: base default duration on avg_frame_rate if possible. · ea83b032
由 Michael Niedermayer 提交于 11月 05, 2011
```
Fixed Ticket432
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>
```
ea83b032
M
ffmpeg: preserve avg_frame_rate on stream copy. · 0e559023
由 Michael Niedermayer 提交于 11月 05, 2011
```
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>
```
0e559023
M
libvpxenc: Fix "Additional information: g_lag_in_frames out of range [..25]" · 439e1d19
由 Michael Niedermayer 提交于 11月 05, 2011
```
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>
```
439e1d19

Mark AVFilterPad[] compound literals as const. · 5af7daab

由 Reimar Döffinger 提交于 11月 05, 2011

GCC 4.6.2 at least still seems to fail to put them in .rodata though,
see also http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37303Signed-off-by: NReimar Döffinger <Reimar.Doeffinger@gmx.de>

5af7daab

Set AVFrame reference before reget_buffer. · d9010daa

由 Reimar Döffinger 提交于 11月 05, 2011

Otherwise it might return a write-only frame which would break
decoding completely.
Signed-off-by: NReimar Döffinger <Reimar.Doeffinger@gmx.de>

d9010daa

nuv: do not use data not initialized by LZO decompression. · 266f6eef

由 Reimar Döffinger 提交于 11月 05, 2011

This fixes visible corruption in the incomplete last frame
of the FATE sample.
Signed-off-by: NReimar Döffinger <Reimar.Doeffinger@gmx.de>

266f6eef

nuv: Fix combination of size changes and LZO compression. · 95e1dfee

由 Reimar Döffinger 提交于 11月 05, 2011

There were multiple issues, for example might we have to re-run
the decompression when the size of the buffer increased,
we should always use a decompression buffer large enough for
the header (so we do not get stuck when the size is too small).
Signed-off-by: NReimar Döffinger <Reimar.Doeffinger@gmx.de>

95e1dfee

Check NUV per-frame header for validity. · 6f3ebcc3

由 Reimar Döffinger 提交于 11月 05, 2011

Since it contains dimensions parsing an invalid one has rather
annoying effects.
Signed-off-by: NReimar Döffinger <Reimar.Doeffinger@gmx.de>

6f3ebcc3

rtjpeg: check get_block return value for error. · 4e6413c6

由 Reimar Döffinger 提交于 11月 05, 2011

This avoids crashes due to reading out-of-bounds.
Signed-off-by: NReimar Döffinger <Reimar.Doeffinger@gmx.de>

4e6413c6

R
Simplify using get_bits_left. · fffa4530
由 Reimar Döffinger 提交于 11月 05, 2011
```
Signed-off-by: NReimar Döffinger <Reimar.Doeffinger@gmx.de>
```
fffa4530

av_lzo1x_decode: properly handle negative buffer length. · b9242fd1

由 Reimar Döffinger 提交于 11月 05, 2011

Treating them like 0 is safest, current code would invoke
undefined pointer arithmetic behaviour in this case.
Signed-off-by: NReimar Döffinger <Reimar.Doeffinger@gmx.de>

b9242fd1

R
Use FFALIGN. · 7f6c828f
由 Reimar Döffinger 提交于 11月 05, 2011
```
Signed-off-by: NReimar Döffinger <Reimar.Doeffinger@gmx.de>
```
7f6c828f

Try to set AVFrame.reference to correct values. · 371e1654

由 Reimar Döffinger 提交于 11月 05, 2011

I am not sure these new values are correct, not am I sure
the semantics are a good idea since we do not seem to make any
use of them but they caused a lot of confusion, but this
seems to make things closer to matching the documentation.
Signed-off-by: NReimar Döffinger <Reimar.Doeffinger@gmx.de>

371e1654

M
h264: fix ssse3 biweight code with weights of 128 · fb228883
由 Michael Niedermayer 提交于 11月 05, 2011
```
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>
```
fb228883

Merge remote-tracking branch 'cus/stable' · 971701d4

由 Michael Niedermayer 提交于 11月 05, 2011

* cus/stable:
  ffplay: Avoid useage of deprecated url_fileno().
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

971701d4

05 11月, 2011 7 次提交
- P
  wtvenc: use ff_put_guid and remove local copy of this function · 42b5a6f6
  由 Peter Ross 提交于 11月 05, 2011
```
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>
```
  42b5a6f6
- P
  asfenc: rename put_guid to ff_put_guid · b7c9512f
  由 Peter Ross 提交于 11月 05, 2011
```
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>
```
  b7c9512f
- P
  wtvenc: add @file comment · 1efe4ff9
  由 Peter Ross 提交于 11月 05, 2011
```
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>
```
  1efe4ff9
- P
  fix whitespace nits · 3852c29f
  由 Peter Ross 提交于 11月 05, 2011
```
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>
```
  3852c29f
- M
  http: Remove the custom function for disabling chunked posts · 18ae3626
  由 Martin Storsjö 提交于 6月 20, 2010
```
Signed-off-by: NMartin Storsjö <martin@martin.st>
```
  18ae3626
- M
  rtsp: Disable chunked http post through AVOptions · d450cc4f
  由 Martin Storsjö 提交于 6月 20, 2010
```
This avoids having to use a private function.
Signed-off-by: NMartin Storsjö <martin@martin.st>
```
  d450cc4f
- R
  Make ff_mba_* arrays const. · 49baf44c
  由 Reimar Döffinger 提交于 11月 05, 2011
```
Signed-off-by: NReimar Döffinger <Reimar.Doeffinger@gmx.de>
```
  49baf44c