diff options
author | Thibaut Mattern <tmattern@users.sourceforge.net> | 2005-04-22 21:09:28 +0000 |
---|---|---|
committer | Thibaut Mattern <tmattern@users.sourceforge.net> | 2005-04-22 21:09:28 +0000 |
commit | fb1174e2386a77700f686d504650ab552988ba75 (patch) | |
tree | 7bb4c277a438e21f5026b9b3548d40db46afe154 | |
parent | 01ae444a13e8382f4a556edd3e3e8b3dd6549ba9 (diff) | |
download | xine-lib-fb1174e2386a77700f686d504650ab552988ba75.tar.gz xine-lib-fb1174e2386a77700f686d504650ab552988ba75.tar.bz2 |
- Fixed BUF_FLAG_SPECIAL handling.
Should fix problems introduced by my last cleanup.
CVS patchset: 7485
CVS date: 2005/04/22 21:09:28
-rw-r--r-- | src/libffmpeg/video_decoder.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/libffmpeg/video_decoder.c b/src/libffmpeg/video_decoder.c index 79511bd30..1d2cf88fb 100644 --- a/src/libffmpeg/video_decoder.c +++ b/src/libffmpeg/video_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_decoder.c,v 1.43 2005/04/21 21:54:01 tmattern Exp $ + * $Id: video_decoder.c,v 1.44 2005/04/22 21:09:28 tmattern Exp $ * * xine video decoder plugin using ffmpeg * @@ -1181,15 +1181,19 @@ static void ff_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { ff_handle_preview_buffer(this, buf); - } else if (buf->decoder_flags & BUF_FLAG_HEADER) { + } else { + + if (buf->decoder_flags & BUF_FLAG_SPECIAL) { - ff_handle_header_buffer(this, buf); + ff_handle_special_buffer(this, buf); + + } - } else if (buf->decoder_flags & BUF_FLAG_SPECIAL) { + if (buf->decoder_flags & BUF_FLAG_HEADER) { - ff_handle_special_buffer(this, buf); + ff_handle_header_buffer(this, buf); - } else { + } else { /* decode */ @@ -1226,6 +1230,8 @@ static void ff_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { } else { ff_handle_buffer(this, buf); } + + } } } |