[vlc-commits] codec: mpeg_audio: fix pts update

[Tristan Matthews]

vlc/vlc-2.2 | branch: master | Tristan Matthews  | Sat Nov 
 8 13:04:10 2014 -0500| [330c495ac660e1851324a959a3146032f66e8c70] | committer: 
Tristan Matthews

codec: mpeg_audio: fix pts update

Fixes #12722

(cherry picked from commit 72b03859fd8b715d9baeb5b378170d81517b01e8)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=330c495ac660e1851324a959a3146032f66e8c70
---

 modules/codec/mpeg_audio.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/codec/mpeg_audio.c b/modules/codec/mpeg_audio.c
index c9f7bac..f893dd2 100644
--- a/modules/codec/mpeg_audio.c
+++ b/modules/codec/mpeg_audio.c
@@ -248,7 +248,7 @@ static block_t *DecodeBlock( decoder_t *p_dec, block_t 
**pp_block )
 /* New frame, set the Presentation Time Stamp */
 p_sys->i_pts = p_sys->bytestream.p_block->i_pts;
 if( p_sys->i_pts > VLC_TS_INVALID &&
-p_sys->i_pts != date_Get( &p_sys->end_date ) )
+p_sys->i_pts > date_Get( &p_sys->end_date ) )
 {
 date_Set( &p_sys->end_date, p_sys->i_pts );
 }

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] codec: mpeg_audio: fix pts update

[Tristan Matthews]

vlc | branch: master | Tristan Matthews  | Sat Nov  8 
13:04:10 2014 -0500| [72b03859fd8b715d9baeb5b378170d81517b01e8] | committer: 
Tristan Matthews

codec: mpeg_audio: fix pts update

Fixes #12722

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=72b03859fd8b715d9baeb5b378170d81517b01e8
---

 modules/codec/mpeg_audio.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/codec/mpeg_audio.c b/modules/codec/mpeg_audio.c
index c9f7bac..f893dd2 100644
--- a/modules/codec/mpeg_audio.c
+++ b/modules/codec/mpeg_audio.c
@@ -248,7 +248,7 @@ static block_t *DecodeBlock( decoder_t *p_dec, block_t 
**pp_block )
 /* New frame, set the Presentation Time Stamp */
 p_sys->i_pts = p_sys->bytestream.p_block->i_pts;
 if( p_sys->i_pts > VLC_TS_INVALID &&
-p_sys->i_pts != date_Get( &p_sys->end_date ) )
+p_sys->i_pts > date_Get( &p_sys->end_date ) )
 {
 date_Set( &p_sys->end_date, p_sys->i_pts );
 }

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] trivial_mixer: rewrite, fix dual-mode (fixes #12673)

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont  | Sun Nov  
2 10:16:49 2014 +0200| [5bf84f029b040445afeaa7d16351afd2acb3e5ef] | committer: 
Rémi Denis-Courmont

trivial_mixer: rewrite, fix dual-mode (fixes #12673)

(cherry picked from commit a6c5f999ea28070c73f3c7db47414f666fdd6265)
(cherry picked from commit 1047340ebc8f59895d7ad8747f7ec48528a31f64)
(cherry picked from commit 81765639fdae8b0c9532c31e90e49eb6aecd5d72)
(cherry picked from commit d6388f26bb6efef29397ba91b02befc427b3423e)
(cherry picked from commit 4e63463ac0022f7eca3c4b9decb6ad5501b7ce38)
(cherry picked from commit 4d6a9eaa413c73277648d4f98c5da1840f997b33)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=5bf84f029b040445afeaa7d16351afd2acb3e5ef
---

 modules/audio_filter/channel_mixer/trivial.c |  279 --
 1 file changed, 170 insertions(+), 109 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=5bf84f029b040445afeaa7d16351afd2acb3e5ef
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits