generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mlp: Define End-of-Stream code in common header file and use it in decoder.

Browse Source 
Originally committed as revision 14763 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ramiro Polla 2008-08-14 19:38:39 +00:00
parent 07be55dc8b
commit 1e8bd10c57
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/mlp.h
View File

@ -56,6 +56,9 @@
*/ */
#define MAX_FILTER_ORDER 8 #define MAX_FILTER_ORDER 8
/** Code that signals end of a stream. */
#define END_OF_STREAM 0xd234d234
#define FIR 0 #define FIR 0
#define IIR 1 #define IIR 1

2
libavcodec/mlpdec.c
View File

@ -990,7 +990,7 @@ static int read_access_unit(AVCodecContext *avctx, void* data, int *data_size,
skip_bits(&gb, (-get_bits_count(&gb)) & 15); skip_bits(&gb, (-get_bits_count(&gb)) & 15);
if (substream_data_len[substr] * 8 - get_bits_count(&gb) >= 32 && if (substream_data_len[substr] * 8 - get_bits_count(&gb) >= 32 &&
(show_bits_long(&gb, 32) == 0xd234d234 || (show_bits_long(&gb, 32) == END_OF_STREAM ||
show_bits_long(&gb, 20) == 0xd234e)) { show_bits_long(&gb, 20) == 0xd234e)) {
skip_bits(&gb, 18); skip_bits(&gb, 18);
if (substr == m->max_decoded_substream) if (substr == m->max_decoded_substream)