diff options
| author | Mike Melanson <mike@multimedia.cx> | 2003-05-01 02:01:58 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2003-05-01 02:01:58 +0000 |
| commit | 2a1670865294dc762ee02b56ea2f9fd1c834c5e3 (patch) | |
| tree | d62c77a63d0791d5f7c85a7bcbce891906f469a2 | |
| parent | de16e763a6e887b598e41fc3fd07fb6b32632889 (diff) | |
| download | xine-lib-2a1670865294dc762ee02b56ea2f9fd1c834c5e3.tar.gz xine-lib-2a1670865294dc762ee02b56ea2f9fd1c834c5e3.tar.bz2 | |
pass the QT stsd atoms through to the ffmpeg decoders...who knows? could
be useful someday
CVS patchset: 4732
CVS date: 2003/05/01 02:01:58
| -rw-r--r-- | src/libffmpeg/xine_decoder.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/libffmpeg/xine_decoder.c b/src/libffmpeg/xine_decoder.c index b40334741..68c0cbdc2 100644 --- a/src/libffmpeg/xine_decoder.c +++ b/src/libffmpeg/xine_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: xine_decoder.c,v 1.116 2003/04/28 19:10:01 esnel Exp $ + * $Id: xine_decoder.c,v 1.117 2003/05/01 02:01:58 tmmm Exp $ * * xine decoder plugin using ffmpeg * @@ -747,6 +747,14 @@ static void ff_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { init_video_codec (this, (xine_bmiheader *)buf->content ); init_postprocess (this); + } else if ((buf->decoder_flags & BUF_FLAG_SPECIAL) && + (buf->decoder_info[1] == BUF_SPECIAL_STSD_ATOM)) { + + this->context->extradata_size = buf->decoder_info[2]; + this->context->extradata = xine_xmalloc(buf->decoder_info[2]); + memcpy(this->context->extradata, buf->decoder_info_ptr[2], + buf->decoder_info[2]); + } else if (this->decoder_ok) { if( this->size + buf->size > this->bufsize ) { @@ -1199,6 +1207,15 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) this->decoder_ok = 1; return; + + } else if ((buf->decoder_flags & BUF_FLAG_SPECIAL) && + (buf->decoder_info[1] == BUF_SPECIAL_STSD_ATOM)) { + + this->context->extradata_size = buf->decoder_info[2]; + this->context->extradata = xine_xmalloc(buf->decoder_info[2]); + memcpy(this->context->extradata, buf->decoder_info_ptr[2], + buf->decoder_info[2]); + } else if (this->decoder_ok && !(buf->decoder_flags & BUF_FLAG_SPECIAL)) { if (!this->output_open) { |