[mythtv] FFmpeg resync

[Jean-Yves Avenard]

On 15 December 2012 10:39, Bill Meek <keemllib at gmail.com> wrote:
> OK, so I did a distclean and then a git checkout devel/resync-stable10
> (then built it, of course.) git branch shows I'm on: devel/resync-stable10.
>
> I'm up and running on it, v0.27-pre2-358-ga1eac71-dirty to be specific.
>
> I didn't expect the -dirty. The patch looks like the one from from
> http://code.mythtv.org/trac/ticket/11195 which I had applied to master.

devel/resync-stable10 is other than ffmpeg related changes, master.

So look at it as if it was master.

If you had applied a patch to master, then checked out
devel/resync-stable10 ; your patch will still be applied, hence the
-dirty when you do git describe.

if you want to run a clean copy , do a git reset --hard HEAD on it.

>
> Did you have that patch applied in that branch too, or have I missed a step?

see above.

>
> By the way, the DB Schema Version is: 1309 from commit a1f9793 which
> was released on Wed Dec 5, 2012.

devel/resync-stable10 was last merged with master on December 15th (today)