summaryrefslogtreecommitdiff
path: root/contrib/ffmpeg/libavcodec/libtheoraenc.c
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2008-03-01 03:05:13 +0100
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2008-03-01 03:05:13 +0100
commit1d0b3b20c34517b9d1ddf3ea347776304b0c4b44 (patch)
tree89f4fc640c2becc6f00ae08996754952ecf149c1 /contrib/ffmpeg/libavcodec/libtheoraenc.c
parent09496ad3469a0ade8dbd9a351e639b78f20b7942 (diff)
downloadxine-lib-1d0b3b20c34517b9d1ddf3ea347776304b0c4b44.tar.gz
xine-lib-1d0b3b20c34517b9d1ddf3ea347776304b0c4b44.tar.bz2
Update internal FFmpeg copy.
Diffstat (limited to 'contrib/ffmpeg/libavcodec/libtheoraenc.c')
-rw-r--r--contrib/ffmpeg/libavcodec/libtheoraenc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/ffmpeg/libavcodec/libtheoraenc.c b/contrib/ffmpeg/libavcodec/libtheoraenc.c
index 7f531dbee..c3d848f31 100644
--- a/contrib/ffmpeg/libavcodec/libtheoraenc.c
+++ b/contrib/ffmpeg/libavcodec/libtheoraenc.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/*!
@@ -69,8 +69,8 @@ static int concatenate_packet(unsigned int* offset, AVCodecContext* avc_context,
avc_context->extradata = newdata;
avc_context->extradata_size = newsize;
- avc_context->extradata[ (*offset)++ ] = packet->bytes >> 8;
- avc_context->extradata[ (*offset)++ ] = packet->bytes & 0xff;
+ AV_WB16(avc_context->extradata + (*offset), packet->bytes);
+ *offset += 2;
memcpy( avc_context->extradata + (*offset), packet->packet, packet->bytes );
(*offset) += packet->bytes;
return 0;