Commits · 2b7431287fc2feb637a5a5176065237707f0ee9d · videolan / vlc

05 Jan, 2012 24 commits

Fixed rendering of subpictures with non 0 offset in opengl. · 2b743128

Laurent Aimar authored Jan 05, 2012

It is needed for DVD menu support.
(cherry picked from commit 446263eab3452e84c2c0f7b8725c97585b6f5720)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

2b743128

Fixed zvbi subpictures AR. · a7958769

Laurent Aimar authored Jan 05, 2012

(cherry picked from commit 4343ec78a1fd2af33549d26c0e6bdd2702148ba8)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

a7958769

Scale subpictures without AR to fill up the whole display. · 835a5c00

Laurent Aimar authored Jan 05, 2012

It closes #5683
(cherry picked from commit 705d11a4de11c5ab20941f36f93589b855a5c3ce)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

835a5c00

Qt: code simplification · c7d8dd75

Jean-Baptiste Kempf authored Jan 05, 2012

(cherry picked from commit 02631b2e668f3badc8c6a3349f946d146f4afcdd)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

c7d8dd75

Qt: increase the bottom margin of the controller by one. · d3812045

Jean-Baptiste Kempf authored Jan 05, 2012

(cherry picked from commit 7066f3499092bf7b635db70d4f418375f8ac0104)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

d3812045

Invert speex_dsp and src score capabilities · 04733479

Jean-Baptiste Kempf authored Jan 05, 2012

This is probably temporary, since SRC is more computationly intensive than speex_dsp
But this close #5781
(cherry picked from commit 5c261b04db7a7b7af65d169b7ee0700b55e72cef)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

04733479

contrib: upnp has config.* in a custom dir · e87d7ea6

Rafaël Carré authored Jan 05, 2012

(cherry picked from commit 9b100a5a7ea90ce626cc68430b083040a2749c5e)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

e87d7ea6

contrib: samplerate has config.* in a custom dir · 34b7985a

Rafaël Carré authored Jan 05, 2012

(cherry picked from commit ccf99a62de0e94ea8f6497a9688b7e5cc22d0be3)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

34b7985a

contrib: dvbpsi has config.* in a custom dir · 20cf5c9e

Rafaël Carré authored Jan 05, 2012

(cherry picked from commit d62d0e3f8f2cb96c755bf8e0666bf4dc248b827d)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

20cf5c9e

contrib: update config.{sub,guess} in some packages · 31cc76ab

Rafaël Carré authored Jan 05, 2012

(cherry picked from commit f0296b66c7ce3385042227f79f462862995c177d)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

31cc76ab

Revert "contrib: run $(RECONF) in an arbitrary list of packages" · 88fa831f

Rafaël Carré authored Jan 05, 2012

This reverts commit c9a36881.

Conflicts:

	contrib/src/dvbpsi/rules.mak
(cherry picked from commit aa2748bdc5f45139ec803c9597d80f1f0321f6fd)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

88fa831f

extra/tools: bump automake version · 68aa15d6

Rafaël Carré authored Jan 05, 2012

This version's config.{guess,sub} knows about android
(cherry picked from commit e69c9040387facb214967a14b5adfa0393157ed4)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

68aa15d6

contrib: openjpeg: update config.{guess,sub} · 42ff85ef

Rafaël Carré authored Jan 05, 2012

(cherry picked from commit 2e554edca115a506bdb7ec07323aebf3e628fd0f)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

42ff85ef

x264.c: move mbtree closer to other bitrate options · 78227855

Ilkka Ollakka authored Jan 05, 2012

(cherry picked from commit 140a7dbc9bcb4cb717fd955e98d4c27abc077ffe)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

78227855

x264.c: partly revert vbv-bufsize option handling when bitrate is defined · 0d97f931

Ilkka Ollakka authored Jan 05, 2012

Previous code didn't actually behave so well with small keyints etc.
(cherry picked from commit f1e222cf3197da2a0c395b5a8eae745e470d312e)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

0d97f931

Qt4: Fixed uninitialized variable · 197e6a63

Sharad Dixit authored Jan 05, 2012

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit c023657699e30dbdb6681d5364e73c3114f7e27e)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

197e6a63

contrib: libmpeg2 has autotool files in a custom dir · 652e97aa

Rafaël Carré authored Jan 04, 2012

(cherry picked from commit ebb59d3627b60e4f7547d0e36805c99e9d8e94c8)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

652e97aa

contrib: orc: fix android build · 2df61dd9

Rafaël Carré authored Jan 04, 2012

google's gcc doesn't understand 'restrict'. Use __restrict__
(cherry picked from commit 702502969a8af0c166e6a6ee0af5063d8e742e28)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

2df61dd9

contrib: fix schroedinger build with android toolchain · 2cb55585

Rafaël Carré authored Dec 28, 2011

google's gcc doesn't understand 'restrict'. Use __restrict__
(cherry picked from commit 9f3cdb0791751d638311fe442bae5b8cc0e46408)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

2cb55585

contrib: gnutls: fix android build · 9829cd12

Rafaël Carré authored Dec 26, 2011

gl/ builds replacements for standard headers in case the system ones don't work
but it has the reverse effect: provided headers work and built ones don't
(cherry picked from commit 937f97f2dac655071db62faf2e148b905ec41b94)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

9829cd12

contrib: update config.{guess,sub} on some old packages · f3310398

Rafaël Carré authored Jan 04, 2012

(cherry picked from commit 6e034ff2a289e497a28e6ca4eba1b4e396aac775)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

f3310398

contrib: gme: fix android build · 52d45ab6

Rafaël Carré authored Dec 26, 2011

gcc doesn't understand __restrict, use __restrict__
might break MSVC++ compatibility
(cherry picked from commit 37b428889762b86e3ab9afed4367e9a8882b87e2)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

52d45ab6

UPDATE_AUTOCONFIG: use $(UNPACK_DIR) · da2bc8fd

Rafaël Carré authored Jan 04, 2012

We can't use $@ as we operate before the directory is renamed
(cherry picked from commit 7046b6122b7af1ca7bfa462f33a507959528cb9a)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

da2bc8fd

macosx: fixed build script · 1cf012bc

Felix Paul Kühne authored Jan 05, 2012

(cherry picked from commit a0a79c3ec407c604880a4f24a05b4eecd6e62029)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

1cf012bc

04 Jan, 2012 16 commits

Fixed potential NULL dereference when openning splitted rar files. · 717d7371

Laurent Aimar authored Jan 03, 2012

(cherry picked from commit 632b98d497c8c36b6bf1f61a8400501e293f51a4)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

717d7371

Fixed BDA support (close #5627). · c58d6d69

Laurent Aimar authored Jan 03, 2012

(cherry picked from commit 435f1d55e7745df14c4e3a725d18dc2f32b6c7f1)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

c58d6d69

contrib: gmp: update config.{guess,sub}, needed for android · 29aa431e

Rafaël Carré authored Dec 28, 2011

(cherry picked from commit 73b765d645757f1ef70c71a7589ff9875a5b9999)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

29aa431e

contrib: helper to copy recent config.{guess,sub} from automake · e86f5135

Rafaël Carré authored Dec 28, 2011

(cherry picked from commit e10f808bfda43a49dff3b49cdac6edc18c3b67db)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

e86f5135

Xspf: fix crash · 75c93cb2

Jean-Baptiste Kempf authored Jan 04, 2012

See http://forum.videolan.org/viewtopic.php?f=12&t=96883
(cherry picked from commit 4c21c6506d93a9cf92992bf302a53ad77ddf7829)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

75c93cb2

extras/tools: added openssl needed for native compilation on Darwin 9 / OS X 10.5 · 725db369
Felix Paul Kühne authored Jan 04, 2012
```
(cherry picked from commit 0921213abbe77ebe799fe8fac17f9a234bcd0fcf)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
```
725db369

macosx: hide the mouse cursor in Lion fullscreen · 68eeac8e

Brendon Justin authored Jan 03, 2012

Though #5327 is closed, 1.2 and 1.3 nightlies do not work
as expected.  The patch makes the cursor hide after every
mouse movement.
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
(cherry picked from commit 07dcbf50)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

68eeac8e

DShow: remove choices from translated string · 9aa83524

Jean-Baptiste Kempf authored Jan 04, 2012

Should simplify translators' work
(cherry picked from commit fd08420a)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

9aa83524

update macosx/build.sh · 84cd6e04

Rafaël Carré authored Jan 03, 2012

(cherry picked from commit aa7354d1)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

84cd6e04

Qt4: Add new timelabels to default layout · 308a2749

Edward Wang authored Jan 01, 2012

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit e0fee1e5)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

308a2749

Qt4: allow more types of timeLabel in toolbars · fa557863

Edward Wang authored Jan 01, 2012

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit abfcd0d5)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

fa557863

Qt4: add the slower/faster buttons near the speed slider · 527681a3
Jean-Baptiste Kempf authored Jan 03, 2012
```
(cherry picked from commit e06dc389)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
```
527681a3

Qt4: allow speedlabel in toolbars · f4e6eb8f

Edward Wang authored Jan 01, 2012

Modified-by: Jean-Baptiste Kempf <jb@videolan.org>
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 18120e5a)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

f4e6eb8f

Qt4: Add aspect ratio combobox to toolbar editor · c0a36f95

Edward Wang authored Dec 28, 2011

Close #4127
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit c630050511ad95a7a7336b3529211c1162130126)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

c0a36f95

Denote warnings in demuxer that can happen in normal situations · 79a346b0
Jean-Baptiste Kempf authored Jan 03, 2012
```
(cherry picked from commit f6287174)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
```
79a346b0

Qt4: Fix a small playlist docking bug · 955adb07

Edward Wang authored Jan 02, 2012

Fix a small playlist docking bug where the playlistWidget is not properly set as a Qt::Widget, causing it to behave inappropriately.

Close #5773
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 6a0131da)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

955adb07